This is a note to let you know that I've just added the patch titled
ASoC: atmel: Fix unlocked snd_pcm_stop() call
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-atmel-fix-unlocked-snd_pcm_stop-call.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 571185717f8d7f2a088a7ac38d94a9ad5fd9da5c Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu, 11 Jul 2013 18:00:01 +0200
Subject: ASoC: atmel: Fix unlocked snd_pcm_stop() call
From: Takashi Iwai <tiwai@xxxxxxx>
commit 571185717f8d7f2a088a7ac38d94a9ad5fd9da5c upstream.
snd_pcm_stop() must be called in the PCM substream lock context.
Acked-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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);
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-3.10/alsa-hda-fix-missing-mic-boost-controls-for-via-codecs.patch
queue-3.10/alsa-hda-fix-return-value-of-snd_hda_check_power_state.patch
queue-3.10/asoc-atmel-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-usx2y-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/asoc-s6000-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-hda-add-new-gpu-codec-id-to-snd-hda.patch
queue-3.10/alsa-ua101-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-6fire-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-hda-fix-eapd-vmaster-hook-for-ad1884-co.patch
queue-3.10/alsa-hda-cache-the-mux-selection-for-generic-hdmi.patch
queue-3.10/alsa-seq-oss-initialize-midi-clients-asynchronously.patch
queue-3.10/alsa-atiixp-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-asihpi-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-pxa2xx-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-hda-fix-the-max-length-of-control-name-in-generic-parser.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html