lkml.org 
[lkml]   [2013]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 047/103] ASoC: atmel: Fix unlocked snd_pcm_stop() call
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Takashi Iwai <tiwai@suse.de>

    commit 571185717f8d7f2a088a7ac38d94a9ad5fd9da5c upstream.

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

    Acked-by: Mark Brown <broonie@linaro.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/atmel/atmel-pcm-dma.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/sound/soc/atmel/atmel-pcm-dma.c
    +++ b/sound/soc/atmel/atmel-pcm-dma.c
    @@ -81,7 +81,9 @@ static void atmel_pcm_dma_irq(u32 ssc_sr

    /* stop RX and capture: will be enabled again at restart */
    ssc_writex(prtd->ssc->regs, SSC_CR, prtd->mask->ssc_disable);
    + snd_pcm_stream_lock(substream);
    snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
    + snd_pcm_stream_unlock(substream);

    /* now drain RHR and read status to remove xrun condition */
    ssc_readx(prtd->ssc->regs, SSC_RHR);



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