This is a note to let you know that I've just added the patch titled
ALSA: atiixp: Fix unlocked snd_pcm_stop() call
to the 3.4-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-atiixp-fix-unlocked-snd_pcm_stop-call.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 53fcffc423f4f56269533c2b82f96295019a6f58 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu, 11 Jul 2013 17:56:56 +0200
Subject: ALSA: atiixp: Fix unlocked snd_pcm_stop() call
From: Takashi Iwai <tiwai@xxxxxxx>
commit cc7282b8d5abbd48c81d1465925d464d9e3eaa8f upstream.
snd_pcm_stop() must be called in the PCM substream lock context.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Cc: Weng Meiling <wengmeiling.weng@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/pci/atiixp.c | 2 ++
sound/pci/atiixp_modem.c | 2 ++
2 files changed, 4 insertions(+)
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -688,7 +688,9 @@ static void snd_atiixp_xrun_dma(struct a
if (! dma->substream || ! dma->running)
return;
snd_printdd("atiixp: XRUN detected (DMA %d)\n", dma->ops->type);
+ snd_pcm_stream_lock(dma->substream);
snd_pcm_stop(dma->substream, SNDRV_PCM_STATE_XRUN);
+ snd_pcm_stream_unlock(dma->substream);
}
/*
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -638,7 +638,9 @@ static void snd_atiixp_xrun_dma(struct a
if (! dma->substream || ! dma->running)
return;
snd_printdd("atiixp-modem: XRUN detected (DMA %d)\n", dma->ops->type);
+ snd_pcm_stream_lock(dma->substream);
snd_pcm_stop(dma->substream, SNDRV_PCM_STATE_XRUN);
+ snd_pcm_stream_unlock(dma->substream);
}
/*
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-3.4/asoc-sta32x-fix-wrong-enum-for-limiter2-release-rate.patch
queue-3.4/saa7134-fix-unlocked-snd_pcm_stop-call.patch
queue-3.4/asoc-wm8770-fix-wrong-number-of-enum-items.patch
queue-3.4/alsa-usb-audio-work-around-kef-x300a-firmware-bug.patch
queue-3.4/alsa-usx2y-fix-unlocked-snd_pcm_stop-call.patch
queue-3.4/staging-line6-fix-unlocked-snd_pcm_stop-call.patch
queue-3.4/asoc-s6000-fix-unlocked-snd_pcm_stop-call.patch
queue-3.4/alsa-atiixp-fix-unlocked-snd_pcm_stop-call.patch
queue-3.4/alsa-6fire-fix-unlocked-snd_pcm_stop-call.patch
queue-3.4/alsa-pxa2xx-fix-unlocked-snd_pcm_stop-call.patch
queue-3.4/alsa-ua101-fix-unlocked-snd_pcm_stop-call.patch
queue-3.4/asoc-sta32x-fix-array-access-overflow.patch
queue-3.4/alsa-asihpi-fix-unlocked-snd_pcm_stop-call.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