From: Jeff Garzik Signed-off-by: Jeff Garzik Cc: Dmitry Torokhov Signed-off-by: Andrew Morton --- drivers/input/keyboard/atkbd.c | 9 ++++++--- drivers/input/mouse/psmouse-base.c | 11 +++++++++-- drivers/input/mouse/trackpoint.c | 7 ++++++- 3 files changed, 21 insertions(+), 6 deletions(-) diff -puN drivers/input/keyboard/atkbd.c~input-handle-sysfs-errors drivers/input/keyboard/atkbd.c --- a/drivers/input/keyboard/atkbd.c~input-handle-sysfs-errors +++ a/drivers/input/keyboard/atkbd.c @@ -972,9 +972,8 @@ static int atkbd_connect(struct serio *s if (atkbd->write) { if (atkbd_probe(atkbd)) { - serio_close(serio); err = -ENODEV; - goto fail; + goto fail_close; } atkbd->set = atkbd_select_set(atkbd, atkbd_set, atkbd_extra); @@ -988,7 +987,9 @@ static int atkbd_connect(struct serio *s atkbd_set_keycode_table(atkbd); atkbd_set_device_attrs(atkbd); - sysfs_create_group(&serio->dev.kobj, &atkbd_attribute_group); + err = sysfs_create_group(&serio->dev.kobj, &atkbd_attribute_group); + if (err < 0) + goto fail_close; atkbd_enable(atkbd); @@ -996,6 +997,8 @@ static int atkbd_connect(struct serio *s return 0; + fail_close: + serio_close(serio); fail: serio_set_drvdata(serio, NULL); input_free_device(dev); kfree(atkbd); diff -puN drivers/input/mouse/psmouse-base.c~input-handle-sysfs-errors drivers/input/mouse/psmouse-base.c --- a/drivers/input/mouse/psmouse-base.c~input-handle-sysfs-errors +++ a/drivers/input/mouse/psmouse-base.c @@ -1152,11 +1152,13 @@ static int psmouse_connect(struct serio input_register_device(psmouse->dev); + retval = sysfs_create_group(&serio->dev.kobj, &psmouse_attribute_group); + if (retval) + goto err_out; + if (parent && parent->pt_activate) parent->pt_activate(parent); - sysfs_create_group(&serio->dev.kobj, &psmouse_attribute_group); - psmouse_activate(psmouse); retval = 0; @@ -1174,6 +1176,11 @@ out: mutex_unlock(&psmouse_mutex); return retval; +err_out: + input_unregister_device(psmouse->dev); + psmouse_set_state(psmouse, PSMOUSE_IGNORE); + serio_close(serio); + goto out; } diff -puN drivers/input/mouse/trackpoint.c~input-handle-sysfs-errors drivers/input/mouse/trackpoint.c --- a/drivers/input/mouse/trackpoint.c~input-handle-sysfs-errors +++ a/drivers/input/mouse/trackpoint.c @@ -293,6 +293,7 @@ int trackpoint_detect(struct psmouse *ps struct ps2dev *ps2dev = &psmouse->ps2dev; unsigned char firmware_id; unsigned char button_info; + int rc; if (trackpoint_start_protocol(psmouse, &firmware_id)) return -1; @@ -318,7 +319,11 @@ int trackpoint_detect(struct psmouse *ps trackpoint_defaults(priv); trackpoint_sync(psmouse); - sysfs_create_group(&ps2dev->serio->dev.kobj, &trackpoint_attr_group); + rc=sysfs_create_group(&ps2dev->serio->dev.kobj, &trackpoint_attr_group); + if (rc) { + kfree(priv); + return -1; + } printk(KERN_INFO "IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n", firmware_id, (button_info & 0xf0) >> 4, button_info & 0x0f); _