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[005/251] ALSA: 6fire: 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 5b9ab3f7324a1b94a5a5a76d44cf92dfeb3b5e80 ]

    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>
    ---
    sound/usb/6fire/pcm.c | 12 ++++++++++--
    1 file changed, 10 insertions(+), 2 deletions(-)

    diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c
    index c97d05f..3143d9c 100644
    --- a/sound/usb/6fire/pcm.c
    +++ b/sound/usb/6fire/pcm.c
    @@ -639,17 +639,25 @@ int __devinit usb6fire_pcm_init(struct sfire_chip *chip)
    void usb6fire_pcm_abort(struct sfire_chip *chip)
    {
    struct pcm_runtime *rt = chip->pcm;
    + unsigned long flags;
    int i;

    if (rt) {
    rt->panic = true;

    - if (rt->playback.instance)
    + if (rt->playback.instance) {
    + snd_pcm_stream_lock_irqsave(rt->playback.instance, flags);
    snd_pcm_stop(rt->playback.instance,
    SNDRV_PCM_STATE_XRUN);
    - if (rt->capture.instance)
    + snd_pcm_stream_unlock_irqrestore(rt->playback.instance, flags);
    + }
    +
    + if (rt->capture.instance) {
    + snd_pcm_stream_lock_irqsave(rt->capture.instance, flags);
    snd_pcm_stop(rt->capture.instance,
    SNDRV_PCM_STATE_XRUN);
    + snd_pcm_stream_unlock_irqrestore(rt->capture.instance, flags);
    + }

    for (i = 0; i < PCM_N_URBS; i++) {
    usb_poison_urb(&rt->in_urbs[i].instance);
    --
    1.7.10.4



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