lkml.org 
[lkml]   [2011]   [Dec]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH RESEND] ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
Date
> 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 <axel.lin@gmail.com>
> ---
> 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;

Makes sense

Acked-by: Marek Vasut <marek.vasut@gmail.com>


\
 
 \ /
  Last update: 2011-12-27 16:27    [W:0.174 / U:0.364 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site