summaryrefslogtreecommitdiff
path: root/drivers/remoteproc
diff options
context:
space:
mode:
authorLoic Pallardy <loic.pallardy@st.com>2017-01-31 15:35:53 +0300
committerBjorn Andersson <bjorn.andersson@linaro.org>2017-02-07 00:09:01 +0300
commit3e49ecf6b49c31b70235d260b957376c00265c1e (patch)
tree8ccc37ec3f52d3bdfd367b6427111c1006f21f2d /drivers/remoteproc
parent5e6533f72ce849bf49aaee96429bbe3558789d08 (diff)
downloadlinux-3e49ecf6b49c31b70235d260b957376c00265c1e.tar.xz
remoteproc: st: correct probe error management
Associated clock is prepared in st_rproc_parse_dt function. it should be unprepared in case of error during probing. Signed-off-by: Loic Pallardy <loic.pallardy@st.com> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/remoteproc')
-rw-r--r--drivers/remoteproc/st_remoteproc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c
index f21787b602e3..1468ba213811 100644
--- a/drivers/remoteproc/st_remoteproc.c
+++ b/drivers/remoteproc/st_remoteproc.c
@@ -247,7 +247,7 @@ static int st_rproc_probe(struct platform_device *pdev)
enabled = st_rproc_state(pdev);
if (enabled < 0) {
ret = enabled;
- goto free_rproc;
+ goto free_clk;
}
if (enabled) {
@@ -259,10 +259,12 @@ static int st_rproc_probe(struct platform_device *pdev)
ret = rproc_add(rproc);
if (ret)
- goto free_rproc;
+ goto free_clk;
return 0;
+free_clk:
+ clk_unprepare(ddata->clk);
free_rproc:
rproc_free(rproc);
return ret;