Skip to content

Commit

Permalink
Input: elo - handle input_register_device() failures
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Aug 5, 2006
1 parent f287cae commit 6b50d8b
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions drivers/input/touchscreen/elo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 6b50d8b

Please sign in to comment.