diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-05 22:40:03 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-05 22:40:03 -0500 |
| commit | 52c1f5704d7555a16641429b2e7af5d26d7b119a (patch) | |
| tree | eb55cec7167646ba18f09d7d4b0009712fe45062 /drivers/input/touchscreen/mtouch.c | |
| parent | 2b03b60e6b8635fffdd15d5d24943950f2bbf96e (diff) | |
| download | linux-52c1f5704d7555a16641429b2e7af5d26d7b119a.tar.bz2 | |
Input: touchscreens - handle errors when registering input devices
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen/mtouch.c')
| -rw-r--r-- | drivers/input/touchscreen/mtouch.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/input/touchscreen/mtouch.c b/drivers/input/touchscreen/mtouch.c index 3b4c61664b63..c66b399774f2 100644 --- a/drivers/input/touchscreen/mtouch.c +++ b/drivers/input/touchscreen/mtouch.c @@ -137,7 +137,7 @@ static int mtouch_connect(struct serio *serio, struct serio_driver *drv) input_dev = input_allocate_device(); if (!mtouch || !input_dev) { err = -ENOMEM; - goto fail; + goto fail1; } mtouch->serio = serio; @@ -160,14 +160,17 @@ static int mtouch_connect(struct serio *serio, struct serio_driver *drv) err = serio_open(serio, drv); if (err) - goto fail; + goto fail2; - input_register_device(mtouch->dev); + err = input_register_device(mtouch->dev); + if (err) + goto fail3; return 0; - fail: serio_set_drvdata(serio, NULL); - input_free_device(input_dev); + fail3: serio_close(serio); + fail2: serio_set_drvdata(serio, NULL); + fail1: input_free_device(input_dev); kfree(mtouch); return err; } |