aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-06-20 14:55:50 -0400
committerMark Brown <broonie@kernel.org>2015-07-07 13:24:32 -0400
commit9acc7f08716b98730e1ead7e785fb0f3ad3a2d07 (patch)
tree478a27acf2a67de583399f38afe8b1b1d8088c77
parentd770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff)
ASoC: max98090: 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/max98090.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 78268f0514e9..1697340c3842 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -1801,10 +1801,13 @@ static int max98090_set_bias_level(struct snd_soc_codec *codec,
1801 if (IS_ERR(max98090->mclk)) 1801 if (IS_ERR(max98090->mclk))
1802 break; 1802 break;
1803 1803
1804 if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_ON) 1804 if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_ON) {
1805 clk_disable_unprepare(max98090->mclk); 1805 clk_disable_unprepare(max98090->mclk);
1806 else 1806 } else {
1807 clk_prepare_enable(max98090->mclk); 1807 ret = clk_prepare_enable(max98090->mclk);
1808 if (ret)
1809 return ret;
1810 }
1808 break; 1811 break;
1809 1812
1810 case SND_SOC_BIAS_STANDBY: 1813 case SND_SOC_BIAS_STANDBY: