diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2013-10-14 08:06:24 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2013-10-14 10:15:39 +0200 |
| commit | ee9bf2e547f224b68b3a4cc08ad7eb919c9eca3f (patch) | |
| tree | 785af9511c2622f143e632e2e1b748514430684f /sound/usb/usx2y/usbusx2yaudio.c | |
| parent | 71ef4d7a1a378901bb4a60ea1cdc2542a4d47f42 (diff) | |
| parent | 61e6cfa80de5760bbe406f4e815b7739205754d2 (diff) | |
| download | kernel_goldelico_gta04-ee9bf2e547f224b68b3a4cc08ad7eb919c9eca3f.zip kernel_goldelico_gta04-ee9bf2e547f224b68b3a4cc08ad7eb919c9eca3f.tar.gz kernel_goldelico_gta04-ee9bf2e547f224b68b3a4cc08ad7eb919c9eca3f.tar.bz2 | |
Merge remote-tracking branch 'linus/master' for 3.12-rc5
Diffstat (limited to 'sound/usb/usx2y/usbusx2yaudio.c')
| -rw-r--r-- | sound/usb/usx2y/usbusx2yaudio.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index 63fb521..6234a51 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c @@ -299,19 +299,6 @@ static void usX2Y_error_urb_status(struct usX2Ydev *usX2Y, usX2Y_clients_stop(usX2Y); } -static void usX2Y_error_sequence(struct usX2Ydev *usX2Y, - struct snd_usX2Y_substream *subs, struct urb *urb) -{ - snd_printk(KERN_ERR -"Sequence Error!(hcd_frame=%i ep=%i%s;wait=%i,frame=%i).\n" -"Most probably some urb of usb-frame %i is still missing.\n" -"Cause could be too long delays in usb-hcd interrupt handling.\n", - usb_get_current_frame_number(usX2Y->dev), - subs->endpoint, usb_pipein(urb->pipe) ? "in" : "out", - usX2Y->wait_iso_frame, urb->start_frame, usX2Y->wait_iso_frame); - usX2Y_clients_stop(usX2Y); -} - static void i_usX2Y_urb_complete(struct urb *urb) { struct snd_usX2Y_substream *subs = urb->context; @@ -328,12 +315,9 @@ static void i_usX2Y_urb_complete(struct urb *urb) usX2Y_error_urb_status(usX2Y, subs, urb); return; } - if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF))) - subs->completed_urb = urb; - else { - usX2Y_error_sequence(usX2Y, subs, urb); - return; - } + + subs->completed_urb = urb; + { struct snd_usX2Y_substream *capsubs = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE], *playbacksubs = usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK]; |