lkml.org 
[lkml]   [2013]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[032/251] staging: line6: Fix unlocked snd_pcm_stop() call
    3.6.11.9-rc1 stable review patch.
    If anyone has any objections, please let me know.

    ------------------

    From: Takashi Iwai <tiwai@suse.de>

    [ Upstream commit 86f0b5b86d142b9323432fef078a6cf0fb5dda74 ]

    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>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    drivers/staging/line6/pcm.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/staging/line6/pcm.c b/drivers/staging/line6/pcm.c
    index 5e319e3..01f00fd 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);
    + }
    }

    /*
    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-09-11 07:41    [W:4.045 / U:0.816 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site