Skip to content

Commit

Permalink
Input: sidewinder - 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 847fd5f commit 07cf779
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/input/joystick/sidewinder.c
Original file line number Diff line number Diff line change
Expand Up @@ -771,12 +771,15 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)

dbg("%s%s [%d-bit id %d data %d]\n", sw->name, comment, m, l, k);

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

return 0;

fail3: while (--i >= 0)
fail4: input_free_device(sw->dev[i]);
fail3: while (--i >= 0)
input_unregister_device(sw->dev[i]);
fail2: gameport_close(gameport);
fail1: gameport_set_drvdata(gameport, NULL);
Expand All @@ -801,6 +804,7 @@ static void sw_disconnect(struct gameport *gameport)
static struct gameport_driver sw_drv = {
.driver = {
.name = "sidewinder",
.owner = THIS_MODULE,
},
.description = DRIVER_DESC,
.connect = sw_connect,
Expand Down

0 comments on commit 07cf779

Please sign in to comment.