diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
| commit | e0d2054fd3cf167395390dc1758644486c782707 (patch) | |
| tree | 108fd3138f0246f5fa17454680d6d04a670ed6d8 /sound/usb/usx2y/usbusx2y.c | |
| parent | d807500a2472445d05ce641bf09438e3d72eeb4f (diff) | |
| parent | c468ac29e63b9927275a94379d00b367f0f97c43 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/usb/usx2y/usbusx2y.c')
| -rw-r--r-- | sound/usb/usx2y/usbusx2y.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c index af8b84954054..5ce0da23ee96 100644 --- a/sound/usb/usx2y/usbusx2y.c +++ b/sound/usb/usx2y/usbusx2y.c | |||
| @@ -227,9 +227,9 @@ static void i_usX2Y_In04Int(struct urb *urb) | |||
| 227 | 227 | ||
| 228 | if (usX2Y->US04) { | 228 | if (usX2Y->US04) { |
| 229 | if (0 == usX2Y->US04->submitted) | 229 | if (0 == usX2Y->US04->submitted) |
| 230 | do | 230 | do { |
| 231 | err = usb_submit_urb(usX2Y->US04->urb[usX2Y->US04->submitted++], GFP_ATOMIC); | 231 | err = usb_submit_urb(usX2Y->US04->urb[usX2Y->US04->submitted++], GFP_ATOMIC); |
| 232 | while (!err && usX2Y->US04->submitted < usX2Y->US04->len); | 232 | } while (!err && usX2Y->US04->submitted < usX2Y->US04->len); |
| 233 | } else | 233 | } else |
| 234 | if (us428ctls && us428ctls->p4outLast >= 0 && us428ctls->p4outLast < N_us428_p4out_BUFS) { | 234 | if (us428ctls && us428ctls->p4outLast >= 0 && us428ctls->p4outLast < N_us428_p4out_BUFS) { |
| 235 | if (us428ctls->p4outLast != us428ctls->p4outSent) { | 235 | if (us428ctls->p4outLast != us428ctls->p4outSent) { |