summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2012-12-14 14:53:32 +0900
committerSimon Horman <horms+renesas@verge.net.au>2013-03-13 02:24:35 +0900
commit2fd61b32764c82b8410a4374d0ab3ec418ce37c7 (patch)
tree5ac1e9e3a3faca93810d4baa6378ffb94ddb7162 /drivers/clocksource
parentf6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff)
downloadblackbird-op-linux-2fd61b32764c82b8410a4374d0ab3ec418ce37c7.tar.gz
blackbird-op-linux-2fd61b32764c82b8410a4374d0ab3ec418ce37c7.zip
clocksource: sh_cmt: Take care of clk_put() when setup_irq() fails
Make sure clk_put() is called in case of failure in sh_cmt_setup(). Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> Signed-off-by: Magnus Damm <damm@opensource.se> Acked-by: John Stultz <john.stultz@linaro.org> Tested-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/sh_cmt.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 488c14cc8dbf..4b8d2962cad7 100644
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -708,17 +708,19 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
cfg->clocksource_rating);
if (ret) {
dev_err(&p->pdev->dev, "registration failed\n");
- goto err1;
+ goto err2;
}
p->cs_enabled = false;
ret = setup_irq(irq, &p->irqaction);
if (ret) {
dev_err(&p->pdev->dev, "failed to request irq %d\n", irq);
- goto err1;
+ goto err2;
}
return 0;
+err2:
+ clk_put(p->clk);
err1:
iounmap(p->mapbase);
OpenPOWER on IntegriCloud