From: Eric Millbrandt Date: Fri, 2 Nov 2012 21:05:44 +0000 (-0400) Subject: ASoC: wm8978: pll incorrectly configured when codec is master X-Git-Tag: firefly_0821_release~3680^2~1589^2~11^2^7 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=55c6f4cb6ef49afbb86222c6a3ff85329199c729;p=firefly-linux-kernel-4.4.55.git ASoC: wm8978: pll incorrectly configured when codec is master When MCLK is supplied externally and BCLK and LRC are configured as outputs (codec is master), the PLL values are only calculated correctly on the first transmission. On subsequent transmissions, at differenct sample rates, the wrong PLL values are used. Test for f_opclk instead of f_pllout to determine if the PLL values are needed. Signed-off-by: Eric Millbrandt Signed-off-by: Mark Brown Cc: stable@vger.kernel.org --- diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index 5421fd9fbcb5..4c0a8e496131 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c @@ -782,7 +782,7 @@ static int wm8978_hw_params(struct snd_pcm_substream *substream, wm8978->mclk_idx = -1; f_sel = wm8978->f_mclk; } else { - if (!wm8978->f_pllout) { + if (!wm8978->f_opclk) { /* We only enter here, if OPCLK is not used */ int ret = wm8978_configure_pll(codec); if (ret < 0)