Skip to content

Commit

Permalink
Input: grip - handle errors from input_register_device()
Browse files Browse the repository at this point in the history
Also set .owner in driver structure so we'll have a link between
module and driver in sysfs.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Jan 30, 2006
1 parent 3575c34 commit 0399add
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/input/joystick/grip.c
Original file line number Diff line number Diff line change
Expand Up @@ -384,12 +384,15 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
if (t > 0)
set_bit(t, input_dev->keybit);

input_register_device(grip->dev[i]);
err = input_register_device(grip->dev[i]);
if (err)
goto fail4;
}

return 0;

fail3: for (i = 0; i < 2; i++)
fail4: input_free_device(grip->dev[i]);
fail3: while (--i >= 0)
if (grip->dev[i])
input_unregister_device(grip->dev[i]);
fail2: gameport_close(gameport);
Expand All @@ -414,6 +417,7 @@ static void grip_disconnect(struct gameport *gameport)
static struct gameport_driver grip_drv = {
.driver = {
.name = "grip",
.owner = THIS_MODULE,
},
.description = DRIVER_DESC,
.connect = grip_connect,
Expand Down

0 comments on commit 0399add

Please sign in to comment.