lkml.org 
[lkml]   [2013]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH 02/12] clocksource: sh_mtu2: Add clk_prepare/unprepare support
Date
Hi Sergei,

On Tuesday 29 October 2013 15:15:09 Sergei Shtylyov wrote:
> On 29-10-2013 2:49, Laurent Pinchart wrote:
> > 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>
> > ---
> >
> > drivers/clocksource/sh_mtu2.c | 16 ++++++++++++++--
> > 1 file changed, 14 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c
> > index 4aac9ee..3cf1283 100644
> > --- a/drivers/clocksource/sh_mtu2.c
> > +++ b/drivers/clocksource/sh_mtu2.c
> > @@ -313,8 +313,20 @@ 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 = 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 err3;
> > +
> > + return 0;
> > + err3:
> > + clk_unprepare(p->clk);
> > + err2:
> > + clk_put(p->clk);
>
> This one seems to be a fix and so needs to be in a separate patch...

I'll split the patch and repost (same for 03/12)

--
Regards,

Laurent Pinchart



\
 
 \ /
  Last update: 2013-10-29 14:41    [W:0.128 / U:0.700 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site