diff options
| author | Takashi Iwai | 2012-11-08 15:58:25 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2012-11-08 15:58:25 +0100 |
| commit | 17a4adbe68c8e6c1fde8decb2345dc4acea87934 (patch) | |
| tree | 16d772ee8b5904ad9b92e1514e131bc504a079ae /sound/usb/pcm.c | |
| parent | ALSA: hda - Keep power link on for PantherPoint HDMI (diff) | |
| parent | ALSA: Fix card refcount unbalance (diff) | |
| download | kernel-qcow2-linux-17a4adbe68c8e6c1fde8decb2345dc4acea87934.tar.gz kernel-qcow2-linux-17a4adbe68c8e6c1fde8decb2345dc4acea87934.tar.xz kernel-qcow2-linux-17a4adbe68c8e6c1fde8decb2345dc4acea87934.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/usb/pcm.c')
| -rw-r--r-- | sound/usb/pcm.c | 3 |
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) goto unlock; } + snd_usb_endpoint_sync_pending_stop(subs->sync_endpoint); + snd_usb_endpoint_sync_pending_stop(subs->data_endpoint); + ret = set_format(subs, subs->cur_audiofmt); if (ret < 0) goto unlock; |