From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 31 Dec 2013 05:33:58 +0000 (-0800)
Subject: 3.4-stable patches
X-Git-Tag: v3.4.76~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da53802baa723be27de10da1b55496105f07f733;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	alsa-add-sndrv_pcm_state_paused-case-in-wait_for_avail-function.patch
	asoc-wm8904-fix-dsp-mode-b-configuration.patch
---

diff --git a/queue-3.4/alsa-add-sndrv_pcm_state_paused-case-in-wait_for_avail-function.patch b/queue-3.4/alsa-add-sndrv_pcm_state_paused-case-in-wait_for_avail-function.patch
new file mode 100644
index 00000000000..58f939bf8a4
--- /dev/null
+++ b/queue-3.4/alsa-add-sndrv_pcm_state_paused-case-in-wait_for_avail-function.patch
@@ -0,0 +1,33 @@
+From ed697e1aaf7237b1a62af39f64463b05c262808d Mon Sep 17 00:00:00 2001
+From: JongHo Kim <furmuwon@gmail.com>
+Date: Tue, 17 Dec 2013 23:02:24 +0900
+Subject: ALSA: Add SNDRV_PCM_STATE_PAUSED case in wait_for_avail function
+
+From: JongHo Kim <furmuwon@gmail.com>
+
+commit ed697e1aaf7237b1a62af39f64463b05c262808d upstream.
+
+When the process is sleeping at the SNDRV_PCM_STATE_PAUSED
+state from the wait_for_avail function, the sleep process will be woken by
+timeout(10 seconds). Even if the sleep process wake up by timeout, by this
+patch, the process will continue with sleep and wait for the other state.
+
+Signed-off-by: JongHo Kim <furmuwon@gmail.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/core/pcm_lib.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sound/core/pcm_lib.c
++++ b/sound/core/pcm_lib.c
+@@ -1847,6 +1847,8 @@ static int wait_for_avail(struct snd_pcm
+ 		case SNDRV_PCM_STATE_DISCONNECTED:
+ 			err = -EBADFD;
+ 			goto _endloop;
++		case SNDRV_PCM_STATE_PAUSED:
++			continue;
+ 		}
+ 		if (!tout) {
+ 			snd_printd("%s write error (DMA or IRQ trouble?)\n",
diff --git a/queue-3.4/asoc-wm8904-fix-dsp-mode-b-configuration.patch b/queue-3.4/asoc-wm8904-fix-dsp-mode-b-configuration.patch
new file mode 100644
index 00000000000..febec7c2c44
--- /dev/null
+++ b/queue-3.4/asoc-wm8904-fix-dsp-mode-b-configuration.patch
@@ -0,0 +1,32 @@
+From f0199bc5e3a3ec13f9bc938556517ec430b36437 Mon Sep 17 00:00:00 2001
+From: Bo Shen <voice.shen@atmel.com>
+Date: Wed, 18 Dec 2013 11:26:23 +0800
+Subject: ASoC: wm8904: fix DSP mode B configuration
+
+From: Bo Shen <voice.shen@atmel.com>
+
+commit f0199bc5e3a3ec13f9bc938556517ec430b36437 upstream.
+
+When wm8904 work in DSP mode B, we still need to configure it to
+work in DSP mode. Or else, it will work in Right Justified mode.
+
+Signed-off-by: Bo Shen <voice.shen@atmel.com>
+Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
+Signed-off-by: Mark Brown <broonie@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/codecs/wm8904.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/soc/codecs/wm8904.c
++++ b/sound/soc/codecs/wm8904.c
+@@ -1456,7 +1456,7 @@ static int wm8904_set_fmt(struct snd_soc
+ 
+ 	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+ 	case SND_SOC_DAIFMT_DSP_B:
+-		aif1 |= WM8904_AIF_LRCLK_INV;
++		aif1 |= 0x3 | WM8904_AIF_LRCLK_INV;
+ 	case SND_SOC_DAIFMT_DSP_A:
+ 		aif1 |= 0x3;
+ 		break;
diff --git a/queue-3.4/series b/queue-3.4/series
index 1ef217b5bc2..b0bc7e8905d 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -3,3 +3,5 @@ ceph-cleanup-aborted-requests-when-re-sending-requests.patch
 ceph-wake-up-safe-waiters-when-unregistering-request.patch
 powerpc-kvm-fix-rare-but-potential-deadlock-scene.patch
 tty-pmac_zilog-check-existence-of-ports-in-pmz_console_init.patch
+asoc-wm8904-fix-dsp-mode-b-configuration.patch
+alsa-add-sndrv_pcm_state_paused-case-in-wait_for_avail-function.patch