Commit b53d0b91 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] Repair snd-usb-usx2y over OHCI
parents fe6ea1f7 bc6191b1
...@@ -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