aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-06-20 14:55:53 -0400
committerMark Brown <broonie@kernel.org>2015-07-08 14:09:30 -0400
commit402f2a4f808a5d284de724689751dcd018835579 (patch)
treed422eb2148fe9982f4e64e4c11422b92ec3599a6
parentd770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff)
ASoC: max98095: Check for clk_prepare_enable() error
clk_prepare_enable() may fail, so we should better check its return value and propagate it in the case of error. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/max98095.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index 9a46d3dcf703..66afd2b781e9 100644
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -1653,10 +1653,13 @@ static int max98095_set_bias_level(struct snd_soc_codec *codec,
1653 if (IS_ERR(max98095->mclk)) 1653 if (IS_ERR(max98095->mclk))
1654 break; 1654 break;
1655 1655
1656 if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_ON) 1656 if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_ON) {
1657 clk_disable_unprepare(max98095->mclk); 1657 clk_disable_unprepare(max98095->mclk);
1658 else 1658 } else {
1659 clk_prepare_enable(max98095->mclk); 1659 ret = clk_prepare_enable(max98095->mclk);
1660 if (ret)
1661 return ret;
1662 }
1660 break; 1663 break;
1661 1664
1662 case SND_SOC_BIAS_STANDBY: 1665 case SND_SOC_BIAS_STANDBY: