| From 73ba8c1d897a1b0267d7a092f665fb1e40650710 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_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> |
| (cherry picked from commit a4a5fc3b64cd553820d97667056506636eaaba77) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clocksource/sh_mtu2.c | 11 +++++++++-- |
| 1 file 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) |
| goto err1; |
| } |
| |
| - return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev), |
| - cfg->clockevent_rating); |
| + ret = sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev), |
| + cfg->clockevent_rating); |
| + if (ret < 0) |
| + goto err2; |
| + |
| + return 0; |
| + |
| + err2: |
| + clk_put(p->clk); |
| err1: |
| iounmap(p->mapbase); |
| err0: |
| -- |
| 1.8.5.rc3 |
| |
