From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753078Ab1L0JLe (ORCPT ); Tue, 27 Dec 2011 04:11:34 -0500 Received: from mail-vx0-f174.google.com ([209.85.220.174]:64801 "EHLO mail-vx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752662Ab1L0JL0 convert rfc822-to-8bit (ORCPT ); Tue, 27 Dec 2011 04:11:26 -0500 MIME-Version: 1.0 In-Reply-To: <1324974344.2351.5.camel@phoenix> References: <1324974344.2351.5.camel@phoenix> From: Eric Miao Date: Tue, 27 Dec 2011 17:11:05 +0800 Message-ID: Subject: Re: [PATCH RESEND] ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe To: Axel Lin Cc: linux-kernel@vger.kernel.org, Haojian Zhuang , Russell King , linux-arm-kernel@lists.infradead.org, linux-pcmcia@lists.infradead.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 27, 2011 at 4:25 PM, Axel Lin wrote: > If pxa2xx_drv_pcmcia_add_one fails, it will go to err1 error path. > Add a missing clk_put in the error path. > > Checking the ret value after the for loop is redundant, it is always false. > Thus remove the redundant checking. > > Signed-off-by: Axel Lin Acked-by: Eric Miao > --- >  drivers/pcmcia/pxa2xx_base.c |   12 +++--------- >  1 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c > index a87e272..64d433e 100644 > --- a/drivers/pcmcia/pxa2xx_base.c > +++ b/drivers/pcmcia/pxa2xx_base.c > @@ -328,21 +328,15 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) >                        goto err1; >        } > > -       if (ret) { > -               while (--i >= 0) > -                       soc_pcmcia_remove_one(&sinfo->skt[i]); > -               kfree(sinfo); > -               clk_put(clk); > -       } else { > -               pxa2xx_configure_sockets(&dev->dev); > -               dev_set_drvdata(&dev->dev, sinfo); > -       } > +       pxa2xx_configure_sockets(&dev->dev); > +       dev_set_drvdata(&dev->dev, sinfo); > >        return 0; > >  err1: >        while (--i >= 0) >                soc_pcmcia_remove_one(&sinfo->skt[i]); > +       clk_put(clk); >        kfree(sinfo); >  err0: >        return ret; > -- > 1.7.5.4 > > >