aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-11-08 05:07:59 -0500
committerDaniel Lezcano <daniel.lezcano@linaro.org>2013-11-20 15:55:21 -0500
commita4a5fc3b64cd553820d97667056506636eaaba77 (patch)
tree29c0a4c59eabe9b610e3295f53dfcec8f0a45670
parent1c283531115bda77a9b559271311c1983fbcffaa (diff)
clocksource: sh_mtu2: Release clock when sh_mtu2_register() fails
Fix the probe error path to release the clock resource when the sh_mtu2_register() call fails. Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: linux-kernel@vger.kernel.org Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-rw-r--r--drivers/clocksource/sh_mtu2.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c
index 4aac9ee0d0c0..e6cfb328eb2e 100644
--- a/drivers/clocksource/sh_mtu2.c
+++ b/drivers/clocksource/sh_mtu2.c
@@ -313,8 +313,15 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev)
313 goto err1; 313 goto err1;
314 } 314 }
315 315
316 return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev), 316 ret = sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev),
317 cfg->clockevent_rating); 317 cfg->clockevent_rating);
318 if (ret < 0)
319 goto err2;
320
321 return 0;
322
323 err2:
324 clk_put(p->clk);
318 err1: 325 err1:
319 iounmap(p->mapbase); 326 iounmap(p->mapbase);
320 err0: 327 err0: