Re: [PATCH RESEND] ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe

[Eric Miao]

On Tue, Dec 27, 2011 at 4:25 PM, Axel Lin <axel.lin@xxxxxxxxx> 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 <axel.lin@xxxxxxxxx>

Acked-by: Eric Miao <eric.y.miao@xxxxxxxxx>

> ---
> Â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
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/