dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Input: elo - handle input_register_device() failures 

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2006-08-05 00:27:00 -04:00
parent f287caee80
commit 6b50d8b862
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/input/touchscreen/elo.c
View File

@ -187,11 +187,13 @@ static irqreturn_t elo_interrupt(struct serio *serio,
static void elo_disconnect(struct serio *serio)
{
struct elo* elo = serio_get_drvdata(serio);
struct elo *elo = serio_get_drvdata(serio);
input_get_device(elo->dev);
input_unregister_device(elo->dev);
serio_close(serio);
serio_set_drvdata(serio, NULL);
input_put_device(elo->dev);
kfree(elo);
}
@ -211,7 +213,7 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv)
input_dev = input_allocate_device();
if (!elo || !input_dev) {
err = -ENOMEM;
goto fail;
goto fail1;
}
elo->serio = serio;
@ -257,13 +259,17 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv)
err = serio_open(serio, drv);
if (err)
goto fail;
goto fail2;
err = input_register_device(elo->dev);
if (err)
goto fail3;
input_register_device(elo->dev);
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(elo);
return err;
}