summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-07-20 12:48:17 +0200
committerThierry Reding <thierry.reding@gmail.com>2017-08-21 08:11:26 +0200
commite2b5602af76dec75f474e4173afb4215007ecfa5 (patch)
treea6925922eef953f6d8c3062bd776ae4d65b66b9f
parentc7fdd3f52944b81d807ce7a5fde7d1ca8a2a0919 (diff)
downloadop-kernel-dev-e2b5602af76dec75f474e4173afb4215007ecfa5.zip
op-kernel-dev-e2b5602af76dec75f474e4173afb4215007ecfa5.tar.gz
pwm: tiehrpwm: fix clock imbalance in probe error path
Make sure to unprepare the clock before returning on late probe errors. Fixes: b388f15fd14c ("pwm: pwm-tiehrpwm: Use clk_enable/disable instead clk_prepare/unprepare.") Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-rw-r--r--drivers/pwm/pwm-tiehrpwm.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-tiehrpwm.c b/drivers/pwm/pwm-tiehrpwm.c
index 6e51a07..387eaf1 100644
--- a/drivers/pwm/pwm-tiehrpwm.c
+++ b/drivers/pwm/pwm-tiehrpwm.c
@@ -489,13 +489,18 @@ static int ehrpwm_pwm_probe(struct platform_device *pdev)
ret = pwmchip_add(&pc->chip);
if (ret < 0) {
dev_err(&pdev->dev, "pwmchip_add() failed: %d\n", ret);
- return ret;
+ goto err_clk_unprepare;
}
pm_runtime_enable(&pdev->dev);
platform_set_drvdata(pdev, pc);
return 0;
+
+err_clk_unprepare:
+ clk_unprepare(pc->tbclk);
+
+ return ret;
}
static int ehrpwm_pwm_remove(struct platform_device *pdev)
OpenPOWER on IntegriCloud