summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-07-11 18:02:38 +0200
committerTakashi Iwai <tiwai@suse.de>2013-07-15 21:25:14 +0200
commit86f0b5b86d142b9323432fef078a6cf0fb5dda74 (patch)
tree0a6df3fdcfe0763d603fdb694bc567669643e0f8 /drivers/staging
parente6355ad7b1c6f70e2f48ae159f5658b441ccff95 (diff)
downloadblackbird-obmc-linux-86f0b5b86d142b9323432fef078a6cf0fb5dda74.tar.gz
blackbird-obmc-linux-86f0b5b86d142b9323432fef078a6cf0fb5dda74.zip
staging: line6: Fix unlocked snd_pcm_stop() call
snd_pcm_stop() must be called in the PCM substream lock context. Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/line6/pcm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/line6/pcm.c b/drivers/staging/line6/pcm.c
index 4795f1284906..0dd08ef51398 100644
--- a/drivers/staging/line6/pcm.c
+++ b/drivers/staging/line6/pcm.c
@@ -392,8 +392,11 @@ static int snd_line6_pcm_free(struct snd_device *device)
*/
static void pcm_disconnect_substream(struct snd_pcm_substream *substream)
{
- if (substream->runtime && snd_pcm_running(substream))
+ if (substream->runtime && snd_pcm_running(substream)) {
+ snd_pcm_stream_lock_irq(substream);
snd_pcm_stop(substream, SNDRV_PCM_STATE_DISCONNECTED);
+ snd_pcm_stream_unlock_irq(substream);
+ }
}
/*
OpenPOWER on IntegriCloud