gpio: stmpe: fix error path
Subsystems (3)
PATCH 1/1 gpio: stmpe: fix error path
Free allocated memory. Call stmpe_disable() if it was enabled.
Signed-off-by Vasiliy Kulikov <[email protected]>
---
Compile tested.
Maybe It needs better error path.
drivers/gpio/stmpe-gpio.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpio/stmpe-gpio.c +4 -2
@@ -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;
Signature · 1 line
1.7.0.4
Quoted 6 lines · Vasiliy Kulikov
Free allocated memory. Call
stmpe_disable()if it was enabled.Signed-off-by Vasiliy Kulikov <[email protected]>---
Compile tested.
Maybe It needs better error path.
What do you mean here? Looks good to me so far.
Acked-by Wolfram Sang <[email protected]>
Quoted 34 lines
drivers/gpio/stmpe-gpio.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)drivers/gpio/stmpe-gpio.c +4
-2@@ -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;Signature · 1 line
1.7.0.4
Signature · 2 lines
Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |
Quoted 9 lines · Wolfram Sang
Quoted 6 lines · Vasiliy Kulikov
Free allocated memory. Call
stmpe_disable()if it was enabled.Signed-off-by Vasiliy Kulikov <[email protected]>---
Compile tested.
Maybe It needs better error path.What do you mean here? Looks good to me so far.
Forget it, I was wrong ;)
Signature · 1 line
Vasiliy
Quoted 3 lines · Vasiliy Kulikov
Free allocated memory. Call
stmpe_disable()if it was enabled.Signed-off-by Vasiliy Kulikov <[email protected]>
Acked-by Rabin Vincent <[email protected]>
Thanks,
Rabin
Hi Vasiliy,
Quoted 1 line · Vasiliy Kulikov
Free allocated memory. Call
stmpe_disable()if it was enabled.
Patch applied, thanks.
Quoted 38 lines
Signed-off-by Vasiliy Kulikov <[email protected]>---
Compile tested.
Maybe It needs better error path.drivers/gpio/stmpe-gpio.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)drivers/gpio/stmpe-gpio.c +4
-2@@ -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;Signature · 1 line
1.7.0.4
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/