| From 6369c3db741997997df57df42e093d59f9a2b96b 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: Add clk_prepare/unprepare support |
| |
| 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> |
| (cherry picked from commit bd7549308eed47b3750b3dab692034a553e75663) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clocksource/sh_mtu2.c | 9 +++++++-- |
| 1 file changed, 7 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c |
| index e6cfb328eb2e..3cf12834681e 100644 |
| --- a/drivers/clocksource/sh_mtu2.c |
| +++ b/drivers/clocksource/sh_mtu2.c |
| @@ -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: |
| -- |
| 1.8.5.rc3 |
| |
