summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-05-16 03:18:56 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-05-16 17:55:52 +0200
commitfa63e477ddb09075f68cd5fe4db8f8045627a787 (patch)
tree0ea84da71f7b27930ed2dea43769b11181846785 /sound/soc
parentASoC: Skip noop reconfiguration of WM8958 DSP2 algorithms (diff)
downloadlinux-fa63e477ddb09075f68cd5fe4db8f8045627a787.tar.xz
linux-fa63e477ddb09075f68cd5fe4db8f8045627a787.zip
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
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8958-dsp2.c4
1 files changed, 4 insertions, 0 deletions
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) &&