diff options
| author | Karsten Wiese <fzu@wemgehoertderstaat.de> | 2007-01-10 19:02:26 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-01-23 09:23:36 +0100 |
| commit | bc6191b10018311a301fb6ef22994177c769b868 (patch) | |
| tree | d3dd99a4c1701500b71c1f35b85281b015a1d88b /sound/usb/usx2y | |
| parent | 9ee79a3d372fcb6729893437f4923c5efd1f85db (diff) | |
| download | op-kernel-dev-bc6191b10018311a301fb6ef22994177c769b868.zip op-kernel-dev-bc6191b10018311a301fb6ef22994177c769b868.tar.gz | |
[ALSA] Repair snd-usb-usx2y over OHCI
The previous patch 'Repair snd-usb-usx2y for usb 2.6.18' assumed
urb->start_frame roll over beyond MAX_INT for both UHCI & OHCI.
This isn't true until now (kernel 2.6.20).
Fix this by only looking at the common between OHCI & UHCI Frame number
range.
This is for mainline and stable kernels >= 2.6.18.
Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/usb/usx2y')
| -rw-r--r-- | sound/usb/usx2y/usbusx2yaudio.c | 2 | ||||
| -rw-r--r-- | sound/usb/usx2y/usx2yhwdeppcm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index 367f8a3..0a352e4 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c @@ -322,7 +322,7 @@ static void i_usX2Y_urb_complete(struct urb *urb) usX2Y_error_urb_status(usX2Y, subs, urb); return; } - if (likely(urb->start_frame == usX2Y->wait_iso_frame)) + if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF))) subs->completed_urb = urb; else { usX2Y_error_sequence(usX2Y, subs, urb); diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c index 8f3e35e..a5e7bcd 100644 --- a/sound/usb/usx2y/usx2yhwdeppcm.c +++ b/sound/usb/usx2y/usx2yhwdeppcm.c @@ -243,7 +243,7 @@ static void i_usX2Y_usbpcm_urb_complete(struct urb *urb) usX2Y_error_urb_status(usX2Y, subs, urb); return; } - if (likely(urb->start_frame == usX2Y->wait_iso_frame)) + if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF))) subs->completed_urb = urb; else { usX2Y_error_sequence(usX2Y, subs, urb); |
