From 0d8cdf21d44d33fca16dc388e21af21f277767d9 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Thu, 2 Nov 2006 23:59:30 -0500 Subject: [PATCH] --- yaml --- r: 39671 b: refs/heads/master c: 8ff22ea7d29d99b3dbec08fd541eb406c6775ec1 h: refs/heads/master i: 39669: 9e948600f8c2670c7067838d1346681e0b1a776d 39667: 2cb7b065ac29fc3947b034e5f1553c57276fab82 39663: 8963f96d52ccf88587f74f50968e4fa23216a908 v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/trackpoint.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b77f0eadf04b..be94b133cb0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8dd51650baf0861b0a73acb2c08bb944aa45bc61 +refs/heads/master: 8ff22ea7d29d99b3dbec08fd541eb406c6775ec1 diff --git a/trunk/drivers/input/mouse/trackpoint.c b/trunk/drivers/input/mouse/trackpoint.c index ae5871a0e060..9ab5b5ea809d 100644 --- a/trunk/drivers/input/mouse/trackpoint.c +++ b/trunk/drivers/input/mouse/trackpoint.c @@ -293,6 +293,7 @@ int trackpoint_detect(struct psmouse *psmouse, int set_properties) struct ps2dev *ps2dev = &psmouse->ps2dev; unsigned char firmware_id; unsigned char button_info; + int error; if (trackpoint_start_protocol(psmouse, &firmware_id)) return -1; @@ -305,7 +306,7 @@ int trackpoint_detect(struct psmouse *psmouse, int set_properties) button_info = 0; } - psmouse->private = priv = kcalloc(1, sizeof(struct trackpoint_data), GFP_KERNEL); + psmouse->private = priv = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL); if (!priv) return -1; @@ -318,7 +319,14 @@ int trackpoint_detect(struct psmouse *psmouse, int set_properties) trackpoint_defaults(priv); trackpoint_sync(psmouse); - sysfs_create_group(&ps2dev->serio->dev.kobj, &trackpoint_attr_group); + error = sysfs_create_group(&ps2dev->serio->dev.kobj, &trackpoint_attr_group); + if (error) { + printk(KERN_ERR + "trackpoint.c: failed to create sysfs attributes, error: %d\n", + error); + 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);