1 files changed, 54 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.10/0045-ASoC-dapm-Check-for-bias-level-when-powering-down.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.10/0045-ASoC-dapm-Check-for-bias-level-when-powering-down.patch
new file mode 100644
index 00000000..07d84c30
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.10/0045-ASoC-dapm-Check-for-bias-level-when-powering-down.patch
@@ -0,0 +1,54 @@
+From 2a2a58328a4241c30b0464b700899e7ba93a10a1 Mon Sep 17 00:00:00 2001
+From: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Date: Wed, 22 Feb 2012 15:52:56 +0000
+Subject: [PATCH 45/95] ASoC: dapm: Check for bias level when powering down
+
+commit 7679e42ec833ed70aa34790a5f39dcb7e5bda4fe upstream.
+
+Recent enhancements in the bias management means that we might not be
+in standby when the CODEC is idle and can have active widgets without
+being in full power mode but the shutdown functionality assumes these
+things. Add checks for the bias level at each stage so that we don't
+do transitions other than the ON->PREPARE->STANDBY->OFF ones that the
+drivers are expecting.
+
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/soc-dapm.c |   12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
+index f42e8b9..ea909c5 100644
+--- a/sound/soc/soc-dapm.c
++++ b/sound/soc/soc-dapm.c
+@@ -2982,9 +2982,13 @@ static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm)
+         * standby.
+         */
+        if (powerdown) {
+-               snd_soc_dapm_set_bias_level(dapm, SND_SOC_BIAS_PREPARE);
++               if (dapm->bias_level == SND_SOC_BIAS_ON)
++                       snd_soc_dapm_set_bias_level(dapm,
++                                                   SND_SOC_BIAS_PREPARE);
+                dapm_seq_run(dapm, &down_list, 0, false);
+-               snd_soc_dapm_set_bias_level(dapm, SND_SOC_BIAS_STANDBY);
++               if (dapm->bias_level == SND_SOC_BIAS_PREPARE)
++                       snd_soc_dapm_set_bias_level(dapm,
++                                                   SND_SOC_BIAS_STANDBY);
+        }
+ }
+ 
+@@ -2997,7 +3001,9 @@ void snd_soc_dapm_shutdown(struct snd_soc_card *card)
+ 
+        list_for_each_entry(codec, &card->codec_dev_list, list) {
+                soc_dapm_shutdown_codec(&codec->dapm);
+-               snd_soc_dapm_set_bias_level(&codec->dapm, SND_SOC_BIAS_OFF);
++               if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY)
++                       snd_soc_dapm_set_bias_level(&codec->dapm,
++                                                   SND_SOC_BIAS_OFF);
+        }
+ }
+ 
+-- 
+1.7.9.4
+