lkml.org 
[lkml]   [2013]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 29/75] [media] saa7134: Fix unlocked snd_pcm_stop() call
    Date
    3.8.13.6 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Takashi Iwai <tiwai@suse.de>

    commit e6355ad7b1c6f70e2f48ae159f5658b441ccff95 upstream.

    snd_pcm_stop() must be called in the PCM substream lock context.

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/media/pci/saa7134/saa7134-alsa.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c
    index 10460fd..dbcdfbf 100644
    --- a/drivers/media/pci/saa7134/saa7134-alsa.c
    +++ b/drivers/media/pci/saa7134/saa7134-alsa.c
    @@ -172,7 +172,9 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev,
    dprintk("irq: overrun [full=%d/%d] - Blocks in %d\n",dev->dmasound.read_count,
    dev->dmasound.bufsize, dev->dmasound.blocks);
    spin_unlock(&dev->slock);
    + snd_pcm_stream_lock(dev->dmasound.substream);
    snd_pcm_stop(dev->dmasound.substream,SNDRV_PCM_STATE_XRUN);
    + snd_pcm_stream_unlock(dev->dmasound.substream);
    return;
    }

    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-07-30 18:01    [W:4.033 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site