diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-11 18:02:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-11 16:10:09 -0700 |
| commit | 565ca886fed885e444f33ee66d8ae19f0ef4bbe3 (patch) | |
| tree | da94f1d3b04f1d443bbadfb81babb23a07aefe47 /drivers | |
| parent | eeb57ebb4820dad25f283ed0e875c6a0a498ba54 (diff) | |
| download | lwn-565ca886fed885e444f33ee66d8ae19f0ef4bbe3.tar.gz lwn-565ca886fed885e444f33ee66d8ae19f0ef4bbe3.zip | |
staging: line6: Fix unlocked snd_pcm_stop() call
commit 86f0b5b86d142b9323432fef078a6cf0fb5dda74 upstream.
snd_pcm_stop() must be called in the PCM substream lock context.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Weng Meiling <wengmeiling.weng@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/line6/pcm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/line6/pcm.c b/drivers/staging/line6/pcm.c index 90d2d4475cb4..3f71e9ea051a 100644 --- a/drivers/staging/line6/pcm.c +++ b/drivers/staging/line6/pcm.c @@ -378,8 +378,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); + } } /* |