diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-11 17:58:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 14:07:27 -0700 |
| commit | 1ef08eb2a9a50d9b4dd119bda4f747e1b922a4fc (patch) | |
| tree | 08c93e145cce138b87e8c15147220b2ec0ec158d | |
| parent | 4b06cd616f646a4257b39a1cc9a10410e7c90088 (diff) | |
| download | linux-3.10-1ef08eb2a9a50d9b4dd119bda4f747e1b922a4fc.tar.gz linux-3.10-1ef08eb2a9a50d9b4dd119bda4f747e1b922a4fc.tar.bz2 linux-3.10-1ef08eb2a9a50d9b4dd119bda4f747e1b922a4fc.zip | |
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>
| -rw-r--r-- | sound/usb/usx2y/usbusx2yaudio.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index b37653247ef..0ce903375ea 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) struct snd_usX2Y_substream *subs = usX2Y->subs[s]; if (subs) { if (atomic_read(&subs->state) >= state_PRERUNNING) { + unsigned long flags; + + snd_pcm_stream_lock_irqsave(subs->pcm_substream, flags); snd_pcm_stop(subs->pcm_substream, SNDRV_PCM_STATE_XRUN); + snd_pcm_stream_unlock_irqrestore(subs->pcm_substream, flags); } for (u = 0; u < NRURBS; u++) { struct urb *urb = subs->urb[u]; |