summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-16 00:46:44 -0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-16 22:32:00 -0800
commit1993502d24694c604414d42cccd3aa7a80c0b7ec (patch)
treef1724fe0a28c1132597e5a179f44bd72f399395c /sound
parent71de4d27c8e7e1d27dcab8bb983eff80ec8a3299 (diff)
downloadop-kernel-dev-1993502d24694c604414d42cccd3aa7a80c0b7ec.zip
op-kernel-dev-1993502d24694c604414d42cccd3aa7a80c0b7ec.tar.gz
ASoC: wm8962: Only configure BCLK in hw_params when audio is active
Otherwise we might not have a sensible clocking setup ready. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8962.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index a5b8a09..d285bc1 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2675,7 +2675,8 @@ static int wm8962_hw_params(struct snd_pcm_substream *substream,
WM8962_SAMPLE_RATE_INT_MODE |
WM8962_SAMPLE_RATE_MASK, adctl3);
- wm8962_configure_bclk(codec);
+ if (codec->dapm.bias_level == SND_SOC_BIAS_ON)
+ wm8962_configure_bclk(codec);
return 0;
}
OpenPOWER on IntegriCloud