diff options
| author | Adam Thomson <Adam.Thomson.Opensource@diasemi.com> | 2015-10-07 12:57:14 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-07 13:15:22 +0200 |
| commit | ba856fbd602175d386ab5a4fc0fdd89b912546cb (patch) | |
| tree | b8df2caf3e8b7487101a6ceab3b07f90eedecb1b /sound/soc/codecs/da7219.c | |
| parent | ASoC: da7219: Use of_match_ptr() when assigning match table (diff) | |
| download | linux-ba856fbd602175d386ab5a4fc0fdd89b912546cb.tar.xz linux-ba856fbd602175d386ab5a4fc0fdd89b912546cb.zip | |
ASoC: da7219: Improve error checking of mclk enable/disable
Should only try to enable/disable the provided mclk, during bias
level changes, if it's not NULL. Also return value of
clk_prepare_enable() should be checked and dealt with accordingly.
Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/da7219.c')
| -rw-r--r-- | sound/soc/codecs/da7219.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index adcc079ef801..abba4b36caa0 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -1494,6 +1494,7 @@ static int da7219_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { struct da7219_priv *da7219 = snd_soc_codec_get_drvdata(codec); + int ret; switch (level) { case SND_SOC_BIAS_ON: @@ -1502,7 +1503,14 @@ static int da7219_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_STANDBY: if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { /* MCLK */ - clk_prepare_enable(da7219->mclk); + if (da7219->mclk) { + ret = clk_prepare_enable(da7219->mclk); + if (ret) { + dev_err(codec->dev, + "Failed to enable mclk\n"); + return ret; + } + } /* Master bias */ snd_soc_update_bits(codec, DA7219_REFERENCES, @@ -1528,7 +1536,8 @@ static int da7219_set_bias_level(struct snd_soc_codec *codec, } /* MCLK */ - clk_disable_unprepare(da7219->mclk); + if (da7219->mclk) + clk_disable_unprepare(da7219->mclk); break; } |