From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 16 May 2011 01:18:56 +0000 (-0700)
Subject: ASoC: Don't restart an already running WM8958 DSP2
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=fa63e477ddb09075f68cd5fe4db8f8045627a787;p=openwrt%2Fstaging%2Fblogic.git

ASoC: Don't restart an already running WM8958 DSP2

Don't want to upset the DSP.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Cc: stable@kernel.org
---

diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index ca26779bb6b2..0293763debe5 100644
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
@@ -362,6 +362,10 @@ static void wm8958_dsp_apply(struct snd_soc_codec *codec, int path, int start)
 		path, wm8994->dsp_active, start, pwr_reg, reg);
 
 	if (start && ena) {
+		/* If the DSP is already running then noop */
+		if (reg & WM8958_DSP2_ENA)
+			return;
+
 		/* If either AIFnCLK is not yet enabled postpone */
 		if (!(snd_soc_read(codec, WM8994_AIF1_CLOCKING_1)
 		      & WM8994_AIF1CLK_ENA_MASK) &&