mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
Input: sidewinder - handle errors from input_register_device()
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>
This commit is contained in:
parent
847fd5fbf7
commit
07cf779c00
@ -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);
|
||||
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user