| From de5cdaf59e2f36c645321481f86070ebfa93338c Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 8 Nov 2013 11:07:59 +0100 |
| Subject: 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> |
| (cherry picked from commit 394a4486f009a184b58fc2f2435d6f5f800870bb) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clocksource/sh_tmu.c | 13 ++++++++++--- |
| 1 file 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) |
| 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: |
| -- |
| 1.8.5.rc3 |
| |
