diff options
| author | Andrew F. Davis <afd@ti.com> | 2017-11-29 22:32:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-12-01 14:30:48 +0100 |
| commit | c6b8c779213dfe2a31e12400b1a2cf2a9a843236 (patch) | |
| tree | f6dacb02ecd5d6f7a3febe182e38fd22844c513a /sound/soc/codecs/tlv320aic31xx.c | |
| parent | ASoC: tlv320aic31xx: Switch GPIO handling to use gpiod_* API (diff) | |
| download | linux-c6b8c779213dfe2a31e12400b1a2cf2a9a843236.tar.xz linux-c6b8c779213dfe2a31e12400b1a2cf2a9a843236.zip | |
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: Andrew F. Davis <afd@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/tlv320aic31xx.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic31xx.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index ab03a19f6aaa..05e6d194d6a9 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -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); |