tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds b53d0b91 fe6ea1f7

+2 -2
unified split
+1 -1
sound/usb/usx2y/usbusx2yaudio.c
··· 322 usX2Y_error_urb_status(usX2Y, subs, urb); 323 return; 324 } 325 - if (likely(urb->start_frame == usX2Y->wait_iso_frame)) 326 subs->completed_urb = urb; 327 else { 328 usX2Y_error_sequence(usX2Y, subs, urb);
··· 322 usX2Y_error_urb_status(usX2Y, subs, urb); 323 return; 324 } 325 + if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF))) 326 subs->completed_urb = urb; 327 else { 328 usX2Y_error_sequence(usX2Y, subs, urb);
+1 -1
sound/usb/usx2y/usx2yhwdeppcm.c
··· 243 usX2Y_error_urb_status(usX2Y, subs, urb); 244 return; 245 } 246 - if (likely(urb->start_frame == usX2Y->wait_iso_frame)) 247 subs->completed_urb = urb; 248 else { 249 usX2Y_error_sequence(usX2Y, subs, urb);
··· 243 usX2Y_error_urb_status(usX2Y, subs, urb); 244 return; 245 } 246 + if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF))) 247 subs->completed_urb = urb; 248 else { 249 usX2Y_error_sequence(usX2Y, subs, urb);