leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpio: Fix stmpe error path

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

Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Vasiliy Kulikov 2010-09-12 22:57:19 +04:00 committed by Samuel Ortiz
parent 1819ebcf1d
commit 02bf074923
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpio/stmpe-gpio.c
View File

@ -315,11 +315,11 @@ static int __devinit stmpe_gpio_probe(struct platform_device *pdev)
ret = stmpe_enable(stmpe, STMPE_BLOCK_GPIO); ret = stmpe_enable(stmpe, STMPE_BLOCK_GPIO);
if (ret) if (ret)
return ret; goto out_free;
ret = stmpe_gpio_irq_init(stmpe_gpio); ret = stmpe_gpio_irq_init(stmpe_gpio);
if (ret) if (ret)
goto out_free; goto out_disable;
ret = request_threaded_irq(irq, NULL, stmpe_gpio_irq, IRQF_ONESHOT, ret = request_threaded_irq(irq, NULL, stmpe_gpio_irq, IRQF_ONESHOT,
"stmpe-gpio", stmpe_gpio); "stmpe-gpio", stmpe_gpio);
@ -345,6 +345,8 @@ out_freeirq:
free_irq(irq, stmpe_gpio); free_irq(irq, stmpe_gpio);
out_removeirq: out_removeirq:
stmpe_gpio_irq_remove(stmpe_gpio); stmpe_gpio_irq_remove(stmpe_gpio);
out_disable:
stmpe_disable(stmpe, STMPE_BLOCK_GPIO);
out_free: out_free:
kfree(stmpe_gpio); kfree(stmpe_gpio);
return ret; return ret;