Commit 2fd61b32 authored Dec 14, 2012 by Magnus Damm Committed by Simon Horman Mar 13, 2013

clocksource: sh_cmt: Take care of clk_put() when setup_irq() fails



Make sure clk_put() is called in case of failure in sh_cmt_setup().

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: John Stultz <john.stultz@linaro.org>
Tested-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

parent f6161aa1

drivers/clocksource/sh_cmt.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -708,17 +708,19 @@ static int sh_cmt_setup(struct sh_cmt_priv p, struct platform_device pdev)
		cfg->clocksource_rating);
		if (ret) {
		dev_err(&p->pdev->dev, "registration failed\n");
		goto err1;
		goto err2;
		}
		p->cs_enabled = false;

		ret = setup_irq(irq, &p->irqaction);
		if (ret) {
		dev_err(&p->pdev->dev, "failed to request irq %d\n", irq);
		goto err1;
		goto err2;
		}

		return 0;
		err2:
		clk_put(p->clk);

		err1:
		iounmap(p->mapbase);