Re: [PATCH] gpio: stmpe: fix error path

From: Wolfram Sang
Date: Mon Sep 13 2010 - 15:38:10 EST


On Sun, Sep 12, 2010 at 10:57:19PM +0400, Vasiliy Kulikov wrote:
> Free allocated memory. Call stmpe_disable() if it was enabled.
>
> Signed-off-by: Vasiliy Kulikov <segooon@xxxxxxxxx>
> ---
> Compile tested.
> Maybe It needs better error path.

What do you mean here? Looks good to me so far.

Acked-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>

>
> drivers/gpio/stmpe-gpio.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpio/stmpe-gpio.c b/drivers/gpio/stmpe-gpio.c
> index 65b9960..6e28afa 100644
> --- a/drivers/gpio/stmpe-gpio.c
> +++ b/drivers/gpio/stmpe-gpio.c
> @@ -317,11 +317,11 @@ static int __devinit stmpe_gpio_probe(struct platform_device *pdev)
>
> ret = stmpe_enable(stmpe, STMPE_BLOCK_GPIO);
> if (ret)
> - return ret;
> + goto out_free;
>
> ret = stmpe_gpio_irq_init(stmpe_gpio);
> if (ret)
> - goto out_free;
> + goto out_disable;
>
> ret = request_threaded_irq(irq, NULL, stmpe_gpio_irq, IRQF_ONESHOT,
> "stmpe-gpio", stmpe_gpio);
> @@ -347,6 +347,8 @@ out_freeirq:
> free_irq(irq, stmpe_gpio);
> out_removeirq:
> stmpe_gpio_irq_remove(stmpe_gpio);
> +out_disable:
> + stmpe_disable(stmpe, STMPE_BLOCK_GPIO);
> out_free:
> kfree(stmpe_gpio);
> return ret;
> --
> 1.7.0.4
>

--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |

Attachment: signature.asc
Description: Digital signature