diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-11-08 05:07:59 -0500 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2013-11-20 15:55:23 -0500 |
commit | 394a4486f009a184b58fc2f2435d6f5f800870bb (patch) | |
tree | 38e24407a6955f6434a2e375ded4c40e79c6f794 /drivers | |
parent | bd7549308eed47b3750b3dab692034a553e75663 (diff) |
clocksource: sh_tmu: Release clock when sh_tmu_register() fails
Fix the probe error path to release the clock resource when the
sh_tmu_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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/clocksource/sh_tmu.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c index 78b8dae49628..15978372c937 100644 --- a/drivers/clocksource/sh_tmu.c +++ b/drivers/clocksource/sh_tmu.c | |||
@@ -475,9 +475,16 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) | |||
475 | p->cs_enabled = false; | 475 | p->cs_enabled = false; |
476 | p->enable_count = 0; | 476 | p->enable_count = 0; |
477 | 477 | ||
478 | return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev), | 478 | ret = sh_tmu_register(p, (char *)dev_name(&p->pdev->dev), |
479 | cfg->clockevent_rating, | 479 | cfg->clockevent_rating, |
480 | cfg->clocksource_rating); | 480 | cfg->clocksource_rating); |
481 | if (ret < 0) | ||
482 | goto err2; | ||
483 | |||
484 | return 0; | ||
485 | |||
486 | err2: | ||
487 | clk_put(p->clk); | ||
481 | err1: | 488 | err1: |
482 | iounmap(p->mapbase); | 489 | iounmap(p->mapbase); |
483 | err0: | 490 | err0: |