input: handle sysfs errors
PATCH 1/1 input: handle sysfs errors
Signed-off-by Jeff Garzik <[email protected]>
---
drivers/input/keyboard/atkbd.c | 25 ++++++++++++++++++++----- drivers/input/mouse/psmouse-base.c | 11 +++++++++-- drivers/input/mouse/trackpoint.c | 7 ++++++- 3 files changed, 35 insertions(+), 8 deletions(-)
drivers/input/keyboard/atkbd.c +20 -5
@@ -961,11 +961,16 @@ static int atkbd_connect(struct serio *satkbd_set_keycode_table (atkbd);atkbd_set_device_attrs (atkbd); -device_create_file (&serio->dev, &atkbd_attr_extra); -device_create_file (&serio->dev, &atkbd_attr_scroll); -device_create_file (&serio->dev, &atkbd_attr_set); -device_create_file (&serio->dev, &atkbd_attr_softrepeat); -device_create_file (&serio->dev, &atkbd_attr_softraw); + err =device_create_file (&serio->dev, &atkbd_attr_extra); +if (err) goto fail_serio; + err =device_create_file (&serio->dev, &atkbd_attr_scroll); +if (err) goto fail_extra; + err =device_create_file (&serio->dev, &atkbd_attr_set); +if (err) goto fail_scroll; + err =device_create_file (&serio->dev, &atkbd_attr_softrepeat); +if (err) goto fail_set; + err =device_create_file (&serio->dev, &atkbd_attr_softraw); +if (err) goto fail_softrep;atkbd_enable (atkbd);
@@ -973,6 +978,16 @@ static int atkbd_connect(struct serio *sreturn 0 ; + fail_softrep: +device_remove_file (&serio->dev, &atkbd_attr_softrepeat); + fail_set: +device_remove_file (&serio->dev, &atkbd_attr_set); + fail_scroll: +device_remove_file (&serio->dev, &atkbd_attr_scroll); + fail_extra: +device_remove_file (&serio->dev, &atkbd_attr_extra); + fail_serio: +serio_close (serio); fail:serio_set_drvdata (serio,NULL );input_free_device (dev);kfree (atkbd);
drivers/input/mouse/psmouse-base.c +9 -2
@@ -1152,11 +1152,13 @@ static int psmouse_connect(struct serioinput_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; }
drivers/input/mouse/trackpoint.c +6 -1
@@ -293,6 +293,7 @@ int trackpoint_detect(struct psmouse *psstruct 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 *pstrackpoint_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 );
Dmitry Torokhov
maintainerdrivers/input/keyboard/atkbd.c static int atkbd_connect(struct serio *s · line 965
Quoted 8 lines · Jeff Garzik
drivers/input/keyboard/atkbd.c +2
-5-device_create_file (&serio->dev, &atkbd_attr_extra); -device_create_file (&serio->dev, &atkbd_attr_scroll); -device_create_file (&serio->dev, &atkbd_attr_set); -device_create_file (&serio->dev, &atkbd_attr_softrepeat); -device_create_file (&serio->dev, &atkbd_attr_softraw); + err =device_create_file (&serio->dev, &atkbd_attr_extra); +if (err) goto fail_serio;
I have a patch that converts atkbd to attribute group and also one that handles errors from input_register_drevice. I will add sysfs error checks there as well.
Signature · 1 line
Dmitry