diff options
| author | Shengjiu Wang <shengjiu.wang@freescale.com> | 2016-03-21 13:09:26 +0800 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-06-24 14:46:31 +0200 |
| commit | f9ab99dd399bb4b23bbee404154a913980836a36 (patch) | |
| tree | 81696eef09b4fb7437185d278da6343824f209da | |
| parent | 7b4d7707041ce82668d3327d6964b3e0ebe7153d (diff) | |
MLK-12464-2: ASoC: wm8960: fix clock is not correct after suspend/resume
After the suspend/resume, hw_params may be called in bias_level is not
BIAS_ON, then the PLL is not disable/enabled, if the sample rate is
changed, the output clock is not correct.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
(cherry picked from commit cced8358c2202824dfdc1780609539655ae5fec5)
| -rw-r--r-- | sound/soc/codecs/wm8960.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 1ca4bec38fa3..28eb426a8356 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -761,8 +761,7 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream, wm8960->is_stream_in_use[tx] = true; - if (codec->dapm.bias_level == SND_SOC_BIAS_ON && - !wm8960->is_stream_in_use[!tx]) + if (!wm8960->is_stream_in_use[!tx]) return wm8960_configure_clocking(codec); return 0; @@ -815,10 +814,6 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec, } } - ret = wm8960_configure_clocking(codec); - if (ret) - return ret; - /* Set VMID to 2x50k */ snd_soc_update_bits(codec, WM8960_POWER1, 0x180, 0x80); break; |