From: Greg Kroah-Hartman Date: Wed, 5 Mar 2014 19:40:19 +0000 (-0800) Subject: 3.4-stable patches X-Git-Tag: v3.10.33~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa4c5bed66c14ae547527211f78a5e09b4bea137;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..ac50c032476 --- /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 +Date: Thu, 11 Jul 2013 18:00:59 +0200 +Subject: [media] saa7134: Fix unlocked snd_pcm_stop() call + +From: Takashi Iwai + +commit e6355ad7b1c6f70e2f48ae159f5658b441ccff95 upstream. + +snd_pcm_stop() must be called in the PCM substream lock context. + +Signed-off-by: Takashi Iwai +[wml: Backported to 3.4: Adjust filename] +Signed-off-by: Weng Meiling +Signed-off-by: Greg Kroah-Hartman +--- + 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 c7c7e70cc94..4bd231e7e02 100644 --- 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