diff options
| author |   Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-11-08 11:07:59 +0100 |
|---|---|---|
| committer |   Daniel Lezcano <daniel.lezcano@linaro.org> | 2013-11-20 21:55:21 +0100 |
| commit | a4a5fc3b64cd553820d97667056506636eaaba77 (patch) | |
| tree | 29c0a4c59eabe9b610e3295f53dfcec8f0a45670 /drivers/clocksource/sh_mtu2.c | |
| parent | ARM: at91: rm9200: switch back to clockevents_config_and_register (diff) | |
| download | linux-dev-a4a5fc3b64cd553820d97667056506636eaaba77.tar.xz linux-dev-a4a5fc3b64cd553820d97667056506636eaaba77.zip | |
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>
Diffstat (limited to 'drivers/clocksource/sh_mtu2.c')
| -rw-r--r-- | drivers/clocksource/sh_mtu2.c | 11 |
1 files 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: |