Skip to content

Commit

Permalink
ASoC: max98095: Check for clk_prepare_enable() error
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Fabio Estevam authored and Mark Brown committed Jul 8, 2015
1 parent d770e55 commit 402f2a4
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions sound/soc/codecs/max98095.c
Original file line number Diff line number Diff line change
Expand Up @@ -1653,10 +1653,13 @@ static int max98095_set_bias_level(struct snd_soc_codec *codec,
if (IS_ERR(max98095->mclk))
break;

if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_ON)
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_ON) {
clk_disable_unprepare(max98095->mclk);
else
clk_prepare_enable(max98095->mclk);
} else {
ret = clk_prepare_enable(max98095->mclk);
if (ret)
return ret;
}
break;

case SND_SOC_BIAS_STANDBY:
Expand Down

0 comments on commit 402f2a4

Please sign in to comment.