summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2016-09-17 01:34:33 +0000
committerMark Brown <broonie@kernel.org>2016-09-19 11:25:31 +0100
commitb7c8c5d6927f9e6f3b4c0f8fcc99daa4568ad185 (patch)
tree65e26e38102357d4c8d2dbb85c2d91b8543d3db8 /sound/soc
parent04adc0842f5accf99e9757930fc429bf7788cfb3 (diff)
ASoC: sti: fix missing clk_disable_unprepare() on error in uni_player_start()
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> Acked-by: Arnaud Pouliquen <arnaud.pouliquen@st.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/sti/uniperif_player.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_player.c
index 645e4152e6a1..1bc8ebc2528e 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.