* Krzysztof Helt <krzysztof.h1@poczta.fm> [090514 11:57]:
> On Thu, 14 May 2009 10:49:59 -0700
> Tony Lindgren <tony@atomide.com> wrote:
> 
> > This makes the framebuffer work on omap3.
> > 
> > Also fix the clk_get usage for checkpatch.pl
> > "ERROR: do not use assignment in if condition".
> > 
> > Cc: Imre Deak <imre.deak@nokia.com>
> > Cc: linux-fbdev-devel@lists.sourceforge.net
> > Signed-off-by: Tony Lindgren <tony@atomide.com>
> > ---
> 
> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>

Thanks for looking. Here's v2 of the patch with one line fixed below.

> > --- a/drivers/video/omap/dispc.c
> > +++ b/drivers/video/omap/dispc.c
> > @@ -880,23 +880,25 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev)
> >  
> >  static int get_dss_clocks(void)
> >  {
> > -	if (IS_ERR((dispc.dss_ick = clk_get(dispc.fbdev->dev, "dss_ick")))) {
> > -		dev_err(dispc.fbdev->dev, "can't get dss_ick\n");
> > +	dispc.dss_ick = clk_get(dispc.fbdev->dev, "ick");
> > +	if (IS_ERR(dispc.dss_ick)) {
> > +		dev_err(dispc.fbdev->dev, "can't get ick\n");
> >  		return PTR_ERR(dispc.dss_ick);
> >  	}
> >  
> > -	if (IS_ERR((dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck")))) {
> > +	dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck");
> > +	if (IS_ERR(dispc.dss1_fck)) {
> >  		dev_err(dispc.fbdev->dev, "can't get dss1_fck\n");
> >  		clk_put(dispc.dss_ick);
> >  		return PTR_ERR(dispc.dss1_fck);
> >  	}
> >  
> > -	if (IS_ERR((dispc.dss_54m_fck =
> > -				clk_get(dispc.fbdev->dev, "dss_54m_fck")))) {
> > -		dev_err(dispc.fbdev->dev, "can't get dss_54m_fck\n");
> > +	dispc.dss_54m_fck = clk_get(dispc.fbdev->dev, "tv_fck");
> > +	if (IS_ERR(dispc.dss_54m_fck)) {
> > +		dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
> >  		clk_put(dispc.dss_ick);
> >  		clk_put(dispc.dss1_fck);
> > -		return PTR_ERR(dispc.dss_54m_fck);
> > +
> >  	}

The return PTR_ERR(dispc.dss_54m_fck) should not be left out.

Regards,

Tony