Commit 77fc46ca authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: gamecon - handle errors from input_register_device()

Also gc_remove shouldn't be marked __exit as it is also called from
__init code.
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent c7fd018d
...@@ -706,9 +706,11 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads) ...@@ -706,9 +706,11 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads)
sprintf(gc->phys[i], "%s/input%d", gc->pd->port->name, i); sprintf(gc->phys[i], "%s/input%d", gc->pd->port->name, i);
err = gc_setup_pad(gc, i, pads[i]); err = gc_setup_pad(gc, i, pads[i]);
if (err) if (err)
goto err_free_devs; goto err_unreg_devs;
input_register_device(gc->dev[i]); err = input_register_device(gc->dev[i]);
if (err)
goto err_free_dev;
} }
if (!gc->pads[0]) { if (!gc->pads[0]) {
...@@ -720,9 +722,12 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads) ...@@ -720,9 +722,12 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads)
parport_put_port(pp); parport_put_port(pp);
return gc; return gc;
err_free_devs: err_free_dev:
input_free_device(gc->dev[i]);
err_unreg_devs:
while (--i >= 0) while (--i >= 0)
input_unregister_device(gc->dev[i]); if (gc->dev[i])
input_unregister_device(gc->dev[i]);
err_free_gc: err_free_gc:
kfree(gc); kfree(gc);
err_unreg_pardev: err_unreg_pardev:
...@@ -733,7 +738,7 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads) ...@@ -733,7 +738,7 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads)
return ERR_PTR(err); return ERR_PTR(err);
} }
static void __exit gc_remove(struct gc *gc) static void gc_remove(struct gc *gc)
{ {
int i; int i;
...@@ -771,7 +776,8 @@ static int __init gc_init(void) ...@@ -771,7 +776,8 @@ static int __init gc_init(void)
if (err) { if (err) {
while (--i >= 0) while (--i >= 0)
gc_remove(gc_base[i]); if (gc_base[i])
gc_remove(gc_base[i]);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment