diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-23 14:06:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-23 14:06:05 -0500 |
| commit | b53d0b919ebe227e2b8e49b6e0ddee506be83aa8 (patch) | |
| tree | 61ee610f1f61b16137c1dda5bdcac21b4c12ced1 | |
| parent | fe6ea1f7e5c2d3947bf62f2a219e69718ca0b187 (diff) | |
| parent | bc6191b10018311a301fb6ef22994177c769b868 (diff) | |
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
| -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 367f8a32a665..0a352e46862f 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) | |||
| 322 | usX2Y_error_urb_status(usX2Y, subs, urb); | 322 | usX2Y_error_urb_status(usX2Y, subs, urb); |
| 323 | return; | 323 | return; |
| 324 | } | 324 | } |
| 325 | if (likely(urb->start_frame == usX2Y->wait_iso_frame)) | 325 | if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF))) |
| 326 | subs->completed_urb = urb; | 326 | subs->completed_urb = urb; |
| 327 | else { | 327 | else { |
| 328 | usX2Y_error_sequence(usX2Y, subs, urb); | 328 | usX2Y_error_sequence(usX2Y, subs, urb); |
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c index 8f3e35e24e72..a5e7bcd7ca2e 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) | |||
| 243 | usX2Y_error_urb_status(usX2Y, subs, urb); | 243 | usX2Y_error_urb_status(usX2Y, subs, urb); |
| 244 | return; | 244 | return; |
| 245 | } | 245 | } |
| 246 | if (likely(urb->start_frame == usX2Y->wait_iso_frame)) | 246 | if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF))) |
| 247 | subs->completed_urb = urb; | 247 | subs->completed_urb = urb; |
| 248 | else { | 248 | else { |
| 249 | usX2Y_error_sequence(usX2Y, subs, urb); | 249 | usX2Y_error_sequence(usX2Y, subs, urb); |