mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Input: tmdc - 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:
Dmitry Torokhov 2006-01-29 21:52:26 -05:00
parent ab52cd66ae
commit 4d462b9e23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/input/joystick/tmdc.c
View File

@ -284,13 +284,13 @@ static int tmdc_setup_port(struct tmdc *tmdc, int idx, unsigned char *data)
struct tmdc_port *port; struct tmdc_port *port;
struct input_dev *input_dev; struct input_dev *input_dev;
int i, j, b = 0; int i, j, b = 0;
int err;
tmdc->port[idx] = port = kzalloc(sizeof (struct tmdc_port), GFP_KERNEL); tmdc->port[idx] = port = kzalloc(sizeof (struct tmdc_port), GFP_KERNEL);
input_dev = input_allocate_device(); input_dev = input_allocate_device();
if (!port || !input_dev) { if (!port || !input_dev) {
kfree(port); err = -ENOMEM;
input_free_device(input_dev); goto fail;
return -ENOMEM;
} }
port->mode = data[TMDC_BYTE_ID]; port->mode = data[TMDC_BYTE_ID];
@ -347,9 +347,15 @@ static int tmdc_setup_port(struct tmdc *tmdc, int idx, unsigned char *data)
b += port->btnc[i]; b += port->btnc[i];
} }
input_register_device(port->dev); err = input_register_device(port->dev);
if (err)
goto fail;
return 0; return 0;
fail: input_free_device(input_dev);
kfree(port);
return err;
} }
/* /*
@ -424,6 +430,7 @@ static void tmdc_disconnect(struct gameport *gameport)
static struct gameport_driver tmdc_drv = { static struct gameport_driver tmdc_drv = {
.driver = { .driver = {
.name = "tmdc", .name = "tmdc",
.owner = THIS_MODULE,
}, },
.description = DRIVER_DESC, .description = DRIVER_DESC,
.connect = tmdc_connect, .connect = tmdc_connect,