diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-15 21:18:56 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-16 11:55:52 -0400 |
| commit | fa63e477ddb09075f68cd5fe4db8f8045627a787 (patch) | |
| tree | 0ea84da71f7b27930ed2dea43769b11181846785 /sound/soc/codecs/wm8958-dsp2.c | |
| parent | d7fdae7c6533b9a409158c736781cdd352b76793 (diff) | |
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/codecs/wm8958-dsp2.c')
| -rw-r--r-- | sound/soc/codecs/wm8958-dsp2.c | 4 |
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) | |||
| 362 | path, wm8994->dsp_active, start, pwr_reg, reg); | 362 | path, wm8994->dsp_active, start, pwr_reg, reg); |
| 363 | 363 | ||
| 364 | if (start && ena) { | 364 | if (start && ena) { |
| 365 | /* If the DSP is already running then noop */ | ||
| 366 | if (reg & WM8958_DSP2_ENA) | ||
| 367 | return; | ||
| 368 | |||
| 365 | /* If either AIFnCLK is not yet enabled postpone */ | 369 | /* If either AIFnCLK is not yet enabled postpone */ |
| 366 | if (!(snd_soc_read(codec, WM8994_AIF1_CLOCKING_1) | 370 | if (!(snd_soc_read(codec, WM8994_AIF1_CLOCKING_1) |
| 367 | & WM8994_AIF1CLK_ENA_MASK) && | 371 | & WM8994_AIF1CLK_ENA_MASK) && |