gpio: Fix stmpe error path

Free allocated memory.  Call stmpe_disable() if it was enabled.

Signed-off-by: Vasiliy Kulikov <[email protected]>
Acked-by: Wolfram Sang <[email protected]>
Acked-by: Rabin Vincent <[email protected]>
Signed-off-by: Samuel Ortiz <[email protected]>

diff --git a/drivers/gpio/stmpe-gpio.c b/drivers/gpio/stmpe-gpio.c
index 932759db1ac2c956a4ec9ce135af2cf7d44ae00c..7c9e6a052c45932cc999c671cdd43c7c0bc2139f 100644 (file)
--- a/drivers/gpio/stmpe-gpio.c
+++ b/drivers/gpio/stmpe-gpio.c
@@ -315,11 +315,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);
@@ -345,6 +345,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;