From: Wei Yongjun Date: Wed, 10 Aug 2016 13:53:21 +0000 (+0000) Subject: ASoC: atmel-pdmic: add missing clk_disable_unprepare() on error in atmel_pdmic_cpu_da... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=61743bfaf061e253a58a3a2f22659405cc95939a;p=deliverable%2Flinux.git ASoC: atmel-pdmic: add missing clk_disable_unprepare() on error in atmel_pdmic_cpu_dai_startup() Add the missing clk_disable_unprepare() before return from atmel_pdmic_cpu_dai_startup() in the error handling case. Signed-off-by: Wei Yongjun Signed-off-by: Mark Brown --- diff --git a/sound/soc/atmel/atmel-pdmic.c b/sound/soc/atmel/atmel-pdmic.c index 4cce36e07360..8b4beb07ca43 100644 --- a/sound/soc/atmel/atmel-pdmic.c +++ b/sound/soc/atmel/atmel-pdmic.c @@ -115,8 +115,10 @@ static int atmel_pdmic_cpu_dai_startup(struct snd_pcm_substream *substream, return ret; ret = clk_prepare_enable(dd->pclk); - if (ret) + if (ret) { + clk_disable_unprepare(dd->gclk); return ret; + } /* Clear all bits in the Control Register(PDMIC_CR) */ regmap_write(dd->regmap, PDMIC_CR, 0);