diff options
| -rw-r--r-- | drivers/input/mouse/trackpoint.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c index 22b218018137..f3102494237d 100644 --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c | |||
| @@ -304,7 +304,7 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) | |||
| 304 | return 0; | 304 | return 0; |
| 305 | 305 | ||
| 306 | if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) { | 306 | if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) { |
| 307 | printk(KERN_WARNING "trackpoint.c: failed to get extended button data\n"); | 307 | psmouse_warn(psmouse, "failed to get extended button data\n"); |
| 308 | button_info = 0; | 308 | button_info = 0; |
| 309 | } | 309 | } |
| 310 | 310 | ||
| @@ -326,16 +326,18 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) | |||
| 326 | 326 | ||
| 327 | error = sysfs_create_group(&ps2dev->serio->dev.kobj, &trackpoint_attr_group); | 327 | error = sysfs_create_group(&ps2dev->serio->dev.kobj, &trackpoint_attr_group); |
| 328 | if (error) { | 328 | if (error) { |
| 329 | printk(KERN_ERR | 329 | psmouse_err(psmouse, |
| 330 | "trackpoint.c: failed to create sysfs attributes, error: %d\n", | 330 | "failed to create sysfs attributes, error: %d\n", |
| 331 | error); | 331 | error); |
| 332 | kfree(psmouse->private); | 332 | kfree(psmouse->private); |
| 333 | psmouse->private = NULL; | 333 | psmouse->private = NULL; |
| 334 | return -1; | 334 | return -1; |
| 335 | } | 335 | } |
| 336 | 336 | ||
| 337 | printk(KERN_INFO "IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n", | 337 | psmouse_info(psmouse, |
| 338 | firmware_id, (button_info & 0xf0) >> 4, button_info & 0x0f); | 338 | "IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n", |
| 339 | firmware_id, | ||
| 340 | (button_info & 0xf0) >> 4, button_info & 0x0f); | ||
| 339 | 341 | ||
| 340 | return 0; | 342 | return 0; |
| 341 | } | 343 | } |
