diff options
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 63fb5219f0f8..6234a51625b1 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, | |||
| 299 | usX2Y_clients_stop(usX2Y); | 299 | usX2Y_clients_stop(usX2Y); |
| 300 | } | 300 | } |
| 301 | 301 | ||
| 302 | static void usX2Y_error_sequence(struct usX2Ydev *usX2Y, | ||
| 303 | struct snd_usX2Y_substream *subs, struct urb *urb) | ||
| 304 | { | ||
| 305 | snd_printk(KERN_ERR | ||
| 306 | "Sequence Error!(hcd_frame=%i ep=%i%s;wait=%i,frame=%i).\n" | ||
| 307 | "Most probably some urb of usb-frame %i is still missing.\n" | ||
| 308 | "Cause could be too long delays in usb-hcd interrupt handling.\n", | ||
| 309 | usb_get_current_frame_number(usX2Y->dev), | ||
| 310 | subs->endpoint, usb_pipein(urb->pipe) ? "in" : "out", | ||
| 311 | usX2Y->wait_iso_frame, urb->start_frame, usX2Y->wait_iso_frame); | ||
| 312 | usX2Y_clients_stop(usX2Y); | ||
| 313 | } | ||
| 314 | |||
| 315 | static void i_usX2Y_urb_complete(struct urb *urb) | 302 | static void i_usX2Y_urb_complete(struct urb *urb) |
| 316 | { | 303 | { |
| 317 | struct snd_usX2Y_substream *subs = urb->context; | 304 | struct snd_usX2Y_substream *subs = urb->context; |
| @@ -328,12 +315,9 @@ static void i_usX2Y_urb_complete(struct urb *urb) | |||
| 328 | usX2Y_error_urb_status(usX2Y, subs, urb); | 315 | usX2Y_error_urb_status(usX2Y, subs, urb); |
| 329 | return; | 316 | return; |
| 330 | } | 317 | } |
| 331 | if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF))) | 318 | |
| 332 | subs->completed_urb = urb; | 319 | subs->completed_urb = urb; |
| 333 | else { | 320 | |
| 334 | usX2Y_error_sequence(usX2Y, subs, urb); | ||
| 335 | return; | ||
| 336 | } | ||
| 337 | { | 321 | { |
| 338 | struct snd_usX2Y_substream *capsubs = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE], | 322 | struct snd_usX2Y_substream *capsubs = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE], |
| 339 | *playbacksubs = usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK]; | 323 | *playbacksubs = usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK]; |
