aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/pcm.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-11-08 09:58:25 -0500
committerTakashi Iwai <tiwai@suse.de>2012-11-08 09:58:25 -0500
commit17a4adbe68c8e6c1fde8decb2345dc4acea87934 (patch)
tree16d772ee8b5904ad9b92e1514e131bc504a079ae /sound/usb/pcm.c
parentc9adeefda0e29bed628e40e7f9da1f84243937e7 (diff)
parent8bb4d9ce08b0a92ca174e41d92c180328f86173f (diff)
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/usb/pcm.c')
-rw-r--r--sound/usb/pcm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 8ca6edf29fee..e7329d0449f2 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -565,6 +565,9 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
565 goto unlock; 565 goto unlock;
566 } 566 }
567 567
568 snd_usb_endpoint_sync_pending_stop(subs->sync_endpoint);
569 snd_usb_endpoint_sync_pending_stop(subs->data_endpoint);
570
568 ret = set_format(subs, subs->cur_audiofmt); 571 ret = set_format(subs, subs->cur_audiofmt);
569 if (ret < 0) 572 if (ret < 0)
570 goto unlock; 573 goto unlock;