3.4-stable patches

added patches:
	saa7134-fix-unlocked-snd_pcm_stop-call.patch

diff --git a/queue-3.4/saa7134-fix-unlocked-snd_pcm_stop-call.patch b/queue-3.4/saa7134-fix-unlocked-snd_pcm_stop-call.patch
new file mode 100644 (file)
index 0000000..ac50c03
--- /dev/null
+++ b/queue-3.4/saa7134-fix-unlocked-snd_pcm_stop-call.patch
@@ -0,0 +1,31 @@
+From e6355ad7b1c6f70e2f48ae159f5658b441ccff95 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Thu, 11 Jul 2013 18:00:59 +0200
+Subject: [media] saa7134: Fix unlocked snd_pcm_stop() call
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit e6355ad7b1c6f70e2f48ae159f5658b441ccff95 upstream.
+
+snd_pcm_stop() must be called in the PCM substream lock context.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+[wml: Backported to 3.4: Adjust filename]
+Signed-off-by: Weng Meiling <wengmeiling.weng@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/media/video/saa7134/saa7134-alsa.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/media/video/saa7134/saa7134-alsa.c
++++ b/drivers/media/video/saa7134/saa7134-alsa.c
+@@ -172,7 +172,9 @@ static void saa7134_irq_alsa_done(struct
+               dprintk("irq: overrun [full=%d/%d] - Blocks in %d\n",dev->dmasound.read_count,
+                       dev->dmasound.bufsize, dev->dmasound.blocks);
+               spin_unlock(&dev->slock);
++              snd_pcm_stream_lock(dev->dmasound.substream);
+               snd_pcm_stop(dev->dmasound.substream,SNDRV_PCM_STATE_XRUN);
++              snd_pcm_stream_unlock(dev->dmasound.substream);
+               return;
+       }
+ 

diff --git a/queue-3.4/series b/queue-3.4/series
index c7c7e70cc943feaa5d4b261fa9658191c98bfd9d..4bd231e7e022589fabf05bc6cf5a6de4ae96683b 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -64,3 +64,4 @@ cifs-adjust-sequence-number-downward-after-signing-nt_cancel-request.patch
 nbd-correct-disconnect-behavior.patch
 block-don-t-access-request-after-it-might-be-freed.patch
 ext4-return-enomem-if-sb_getblk-fails.patch
+saa7134-fix-unlocked-snd_pcm_stop-call.patch