clocksource: sh_tmu: Release clock when sh_tmu_register() fails
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Fri, 8 Nov 2013 10:07:59 +0000 (11:07 +0100)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Wed, 20 Nov 2013 20:55:23 +0000 (21:55 +0100)
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>
drivers/clocksource/sh_tmu.c

index 78b8dae49628cce42fb45ebdff2b32ece5045a52..15978372c937343716154f1e0596b0c96f3c29ce 100644 (file)
@@ -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: