mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 00:20:32 +00:00
Code Issues Releases Wiki Activity

Input: db9 - handle errors from input_register_device()

Browse source 
Also db9_remove shouldn't be marked __exit as it is also called from
__init code.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2006-01-29 21:51:36 -05:00
parent 84c61896bd
commit 2e9d675ed2
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/input/joystick/db9.c
View file

@ -616,7 +616,7 @@ static struct db9 __init *db9_probe(int parport, int mode)
if (!input_dev) { if (!input_dev) {
printk(KERN_ERR "db9.c: Not enough memory for input device\n"); printk(KERN_ERR "db9.c: Not enough memory for input device\n");
err = -ENOMEM; err = -ENOMEM;
goto err_free_devs; goto err_unreg_devs;
} }
sprintf(db9->phys[i], "%s/input%d", db9->pd->port->name, i); sprintf(db9->phys[i], "%s/input%d", db9->pd->port->name, i);
@ -642,13 +642,17 @@ static struct db9 __init *db9_probe(int parport, int mode)
input_set_abs_params(input_dev, db9_abs[j], 1, 255, 0, 0); input_set_abs_params(input_dev, db9_abs[j], 1, 255, 0, 0);
} }
input_register_device(input_dev); err = input_register_device(input_dev);
if (err)
goto err_free_dev;
} }
parport_put_port(pp); parport_put_port(pp);
return db9; return db9;
err_free_devs: err_free_dev:
input_free_device(db9->dev[i]);
err_unreg_devs:
while (--i >= 0) while (--i >= 0)
input_unregister_device(db9->dev[i]); input_unregister_device(db9->dev[i]);
kfree(db9); kfree(db9);
@ -660,7 +664,7 @@ static struct db9 __init *db9_probe(int parport, int mode)
return ERR_PTR(err); return ERR_PTR(err);
} }
static void __exit db9_remove(struct db9 *db9) static void db9_remove(struct db9 *db9)
{ {
int i; int i;
@ -698,7 +702,8 @@ static int __init db9_init(void)
if (err) { if (err) {
while (--i >= 0) while (--i >= 0)
db9_remove(db9_base[i]); if (db9_base[i])
db9_remove(db9_base[i]);
return err; return err;
} }