From fa63e477ddb09075f68cd5fe4db8f8045627a787 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sun, 15 May 2011 18:18:56 -0700 Subject: ASoC: Don't restart an already running WM8958 DSP2 Don't want to upset the DSP. Signed-off-by: Mark Brown Acked-by: Liam Girdwood Cc: stable@kernel.org --- sound/soc/codecs/wm8958-dsp2.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sound/soc') diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c index ca26779bb6b..0293763debe 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) && -- cgit v1.2.3-18-g5258