[PATCH -next] ASoC: sti: fix missing clk_disable_unprepare() on error in uni_player_start()

From	Wei Yongjun <weiyj.lk@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH -next] ASoC: sti: fix missing clk_disable_unprepare() on error in uni_player_start()
Date	2016-09-17 03:40 +0200
Message-ID	<sicLL-4iK-3@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Wei Yongjun <weiyongjun1@huawei.com>

Fix the missing clk_disable_unprepare() before return
from uni_player_start() in the error handling case.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
 sound/soc/sti/uniperif_player.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_player.c
index 645e415..1bc8ebc 100644
--- a/sound/soc/sti/uniperif_player.c
+++ b/sound/soc/sti/uniperif_player.c
@@ -893,8 +893,10 @@ static int uni_player_start(struct uniperif *player)
 	SET_UNIPERIF_SOFT_RST_SOFT_RST(player);
 
 	ret = reset_player(player);
-	if (ret < 0)
+	if (ret < 0) {
+		clk_disable_unprepare(player->clk);
 		return ret;
+	}
 
 	/*
 	 * Does not use IEC61937 features of the uniperipheral hardware.

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH -next] ASoC: sti: fix missing clk_disable_unprepare() on error in uni_player_start() Wei Yongjun <weiyj.lk@gmail.com> - 2016-09-17 03:40 +0200
  Re: [PATCH -next] ASoC: sti: fix missing clk_disable_unprepare() on  error in uni_player_start() Arnaud Pouliquen <arnaud.pouliquen@st.com> - 2016-09-19 09:30 +0200
  Applied "ASoC: sti: fix missing clk_disable_unprepare() on error in uni_player_start()" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-09-21 15:00 +0200

csiph-web