From: Kyung-Kwee Ryu Date: Tue, 24 Apr 2012 17:01:48 +0000 (+0100) Subject: ASoC: wm8994: Make sure we disable FLL bypass when stopping the FLL X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e05854ddaa012f3369884acf61ec9953285404b4;p=deliverable%2Flinux.git ASoC: wm8994: Make sure we disable FLL bypass when stopping the FLL If FLL bypass is left enabled when we disable the CODEC then the output clock will be left running which consumes a small amount of additional current. Only enable bypass when there is an output. Signed-off-by: Kyung-Kwee Ryu Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 4cebac4f6215..746d3db6f19f 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -1982,7 +1982,7 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, WM8994_FLL1_ENA, 0); if (wm8994->fll_byp && src == WM8994_FLL_SRC_BCLK && - freq_in == freq_out) { + freq_in == freq_out && freq_out) { dev_dbg(codec->dev, "Bypassing FLL%d\n", id + 1); snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_5 + reg_offset, WM8958_FLL1_BYP, WM8958_FLL1_BYP);