Skip to content

Commit

Permalink
clocksource: sh_mtu2: Add clk_prepare/unprepare support
Browse files Browse the repository at this point in the history
Prepare the clock at probe time, as there is no other appropriate place
in the driver where we're allowed to sleep.

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>
  • Loading branch information
Laurent Pinchart authored and Daniel Lezcano committed Nov 20, 2013
1 parent a4a5fc3 commit bd75493
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/clocksource/sh_mtu2.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,13 +313,18 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev)
goto err1;
}

ret = clk_prepare(p->clk);
if (ret < 0)
goto err2;

ret = sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev),
cfg->clockevent_rating);
if (ret < 0)
goto err2;
goto err3;

return 0;

err3:
clk_unprepare(p->clk);
err2:
clk_put(p->clk);
err1:
Expand Down

0 comments on commit bd75493

Please sign in to comment.