This is a note to let you know that I've just added the patch titled
ALSA: ua101: 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-ua101-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 a4d0e7c132a92025f7c3dd7cf96bc763799ef2de Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu, 11 Jul 2013 17:58:25 +0200
Subject: ALSA: ua101: Fix unlocked snd_pcm_stop() call
From: Takashi Iwai <tiwai@xxxxxxx>
commit 9538aa46c2427d6782aa10036c4da4c541605e0e upstream.
snd_pcm_stop() must be called in the PCM substream lock context.
Acked-by: Clemens Ladisch <clemens@xxxxxxxxxx>
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/usb/misc/ua101.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
--- a/sound/usb/misc/ua101.c
+++ b/sound/usb/misc/ua101.c
@@ -613,14 +613,24 @@ static int start_usb_playback(struct ua1
static void abort_alsa_capture(struct ua101 *ua)
{
- if (test_bit(ALSA_CAPTURE_RUNNING, &ua->states))
+ unsigned long flags;
+
+ if (test_bit(ALSA_CAPTURE_RUNNING, &ua->states)) {
+ snd_pcm_stream_lock_irqsave(ua->capture.substream, flags);
snd_pcm_stop(ua->capture.substream, SNDRV_PCM_STATE_XRUN);
+ snd_pcm_stream_unlock_irqrestore(ua->capture.substream, flags);
+ }
}
static void abort_alsa_playback(struct ua101 *ua)
{
- if (test_bit(ALSA_PLAYBACK_RUNNING, &ua->states))
+ unsigned long flags;
+
+ if (test_bit(ALSA_PLAYBACK_RUNNING, &ua->states)) {
+ snd_pcm_stream_lock_irqsave(ua->playback.substream, flags);
snd_pcm_stop(ua->playback.substream, SNDRV_PCM_STATE_XRUN);
+ snd_pcm_stream_unlock_irqrestore(ua->playback.substream, flags);
+ }
}
static int set_stream_hw(struct ua101 *ua, struct snd_pcm_substream *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