aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-07-11 11:58:47 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-25 17:07:27 -0400
commit1ef08eb2a9a50d9b4dd119bda4f747e1b922a4fc (patch)
tree08c93e145cce138b87e8c15147220b2ec0ec158d /sound
parent4b06cd616f646a4257b39a1cc9a10410e7c90088 (diff)
ALSA: usx2y: Fix unlocked snd_pcm_stop() call
commit 5be1efb4c2ed79c3d7c0cbcbecae768377666e84 upstream. snd_pcm_stop() must be called in the PCM substream lock context. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/usx2y/usbusx2yaudio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index b37653247ef4..0ce903375eaf 100644
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -273,7 +273,11 @@ static void usX2Y_clients_stop(struct usX2Ydev *usX2Y)
273 struct snd_usX2Y_substream *subs = usX2Y->subs[s]; 273 struct snd_usX2Y_substream *subs = usX2Y->subs[s];
274 if (subs) { 274 if (subs) {
275 if (atomic_read(&subs->state) >= state_PRERUNNING) { 275 if (atomic_read(&subs->state) >= state_PRERUNNING) {
276 unsigned long flags;
277
278 snd_pcm_stream_lock_irqsave(subs->pcm_substream, flags);
276 snd_pcm_stop(subs->pcm_substream, SNDRV_PCM_STATE_XRUN); 279 snd_pcm_stop(subs->pcm_substream, SNDRV_PCM_STATE_XRUN);
280 snd_pcm_stream_unlock_irqrestore(subs->pcm_substream, flags);
277 } 281 }
278 for (u = 0; u < NRURBS; u++) { 282 for (u = 0; u < NRURBS; u++) {
279 struct urb *urb = subs->urb[u]; 283 struct urb *urb = subs->urb[u];