Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit c6b8c779 authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Mark Brown
Browse files

ASoC: tlv320aic31xx: Check clock and divider before division 



If our set_sysclk DAI callback has not been called yet p_div will be 0
and dividing by this will cause an error. Print an error message and
leave before this.

Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b6b247cd

sound/soc/codecs/tlv320aic31xx.c

+7 −1
Original line number Diff line number Diff line
@@ -754,11 +754,17 @@ static int aic31xx_setup_pll(struct snd_soc_codec *codec, 
{

	struct aic31xx_priv *aic31xx = snd_soc_codec_get_drvdata(codec);

	int bclk_score = snd_soc_params_to_frame_size(params);

	int mclk_p = aic31xx->sysclk / aic31xx->p_div;

	int mclk_p;

	int bclk_n = 0;

	int match = -1;

	int i;



	if (!aic31xx->sysclk || !aic31xx->p_div) {

		dev_err(codec->dev, "Master clock not supplied\n");

		return -EINVAL;

	}

	mclk_p = aic31xx->sysclk / aic31xx->p_div;



	/* Use PLL as CODEC_CLKIN and DAC_CLK as BDIV_CLKIN */

	snd_soc_update_bits(codec, AIC31XX_CLKMUX,

			    AIC31XX_CODEC_CLKIN_MASK, AIC31XX_CODEC_CLKIN_PLL);