Skip to content

Commit

Permalink
clocksource: sh_tmu: Release clock when sh_tmu_register() fails
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Laurent Pinchart authored and Daniel Lezcano committed Nov 20, 2013
1 parent bd75493 commit 394a448
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions drivers/clocksource/sh_tmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -475,9 +475,16 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev)
p->cs_enabled = false;
p->enable_count = 0;

return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),
cfg->clockevent_rating,
cfg->clocksource_rating);
ret = sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),
cfg->clockevent_rating,
cfg->clocksource_rating);
if (ret < 0)
goto err2;

return 0;

err2:
clk_put(p->clk);
err1:
iounmap(p->mapbase);
err0:
Expand Down

0 comments on commit 394a448

Please sign in to comment.