This is a note to let you know that I've just added the patch titled ALSA: 6fire: 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: alsa-6fire-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 5b9ab3f7324a1b94a5a5a76d44cf92dfeb3b5e80 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@xxxxxxx> Date: Thu, 11 Jul 2013 17:57:55 +0200 Subject: ALSA: 6fire: Fix unlocked snd_pcm_stop() call From: Takashi Iwai <tiwai@xxxxxxx> commit 5b9ab3f7324a1b94a5a5a76d44cf92dfeb3b5e80 upstream. snd_pcm_stop() must be called in the PCM substream lock context. Signed-off-by: Takashi Iwai <tiwai@xxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- sound/usb/6fire/pcm.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) --- a/sound/usb/6fire/pcm.c +++ b/sound/usb/6fire/pcm.c @@ -641,17 +641,25 @@ int usb6fire_pcm_init(struct sfire_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); 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