* [PATCH] Input: h3600_ts - fix error handling at connect
@ 2011-04-04 22:57 Christoph Fritz
2011-04-06 22:35 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Christoph Fritz @ 2011-04-04 22:57 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-input, jsimmons
In case of an error in h3600ts_connect(), deconstruct by correct order
and with the right calls.
Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
---
drivers/input/touchscreen/h3600_ts_input.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c
index b4d7f63..6ae063e 100644
--- a/drivers/input/touchscreen/h3600_ts_input.c
+++ b/drivers/input/touchscreen/h3600_ts_input.c
@@ -399,31 +399,34 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv)
IRQF_SHARED | IRQF_DISABLED, "h3600_action", &ts->dev)) {
printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n");
err = -EBUSY;
- goto fail2;
+ goto fail1;
}
if (request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler,
IRQF_SHARED | IRQF_DISABLED, "h3600_suspend", &ts->dev)) {
printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n");
err = -EBUSY;
- goto fail3;
+ goto fail2;
}
serio_set_drvdata(serio, ts);
err = serio_open(serio, drv);
if (err)
- return err;
+ goto fail3;
//h3600_flite_control(1, 25); /* default brightness */
- input_register_device(ts->dev);
+ err = input_register_device(ts->dev);
+ if (err)
+ goto fail4;
return 0;
-fail3: free_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, ts->dev);
+fail4: serio_close(serio);
+fail3: serio_set_drvdata(serio, NULL);
+ free_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, ts->dev);
fail2: free_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, ts->dev);
-fail1: serio_set_drvdata(serio, NULL);
- input_free_device(input_dev);
+fail1: input_free_device(input_dev);
kfree(ts);
return err;
}
--
1.7.2.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Input: h3600_ts - fix error handling at connect
2011-04-04 22:57 [PATCH] Input: h3600_ts - fix error handling at connect Christoph Fritz
@ 2011-04-06 22:35 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2011-04-06 22:35 UTC (permalink / raw)
To: Christoph Fritz; +Cc: linux-input, jsimmons
On Tue, Apr 05, 2011 at 12:57:12AM +0200, Christoph Fritz wrote:
> In case of an error in h3600ts_connect(), deconstruct by correct order
> and with the right calls.
>
> Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
Applied, thanks Christoph.
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-06 22:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-04 22:57 [PATCH] Input: h3600_ts - fix error handling at connect Christoph Fritz
2011-04-06 22:35 ` Dmitry Torokhov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.