Commit bc6191b1 authored by Karsten Wiese's avatar Karsten Wiese Committed by Jaroslav Kysela

[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: default avatarKarsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 9ee79a3d
...@@ -322,7 +322,7 @@ static void i_usX2Y_urb_complete(struct urb *urb) ...@@ -322,7 +322,7 @@ static void i_usX2Y_urb_complete(struct urb *urb)
usX2Y_error_urb_status(usX2Y, subs, urb); usX2Y_error_urb_status(usX2Y, subs, urb);
return; 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; subs->completed_urb = urb;
else { else {
usX2Y_error_sequence(usX2Y, subs, urb); usX2Y_error_sequence(usX2Y, subs, urb);
......
...@@ -243,7 +243,7 @@ static void i_usX2Y_usbpcm_urb_complete(struct urb *urb) ...@@ -243,7 +243,7 @@ static void i_usX2Y_usbpcm_urb_complete(struct urb *urb)
usX2Y_error_urb_status(usX2Y, subs, urb); usX2Y_error_urb_status(usX2Y, subs, urb);
return; 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; subs->completed_urb = urb;
else { else {
usX2Y_error_sequence(usX2Y, subs, urb); usX2Y_error_sequence(usX2Y, subs, urb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment