aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-11-02 23:59:40 -0500
committerDmitry Torokhov <dtor@insightbb.com>2006-11-02 23:59:40 -0500
commit0fea0e9a9c72dab526447895605fc236c87c2726 (patch)
treecac0f23b68f65d14763ccd9e7d49973f8acade74 /drivers/input
parent8ff22ea7d29d99b3dbec08fd541eb406c6775ec1 (diff)
Input: logips2pp - handle sysfs errors
Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/logips2pp.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
index 8a4f862709e7..d3ddea26b8ca 100644
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
@@ -328,6 +328,7 @@ int ps2pp_init(struct psmouse *psmouse, int set_properties)
328 unsigned char model, buttons; 328 unsigned char model, buttons;
329 const struct ps2pp_info *model_info; 329 const struct ps2pp_info *model_info;
330 int use_ps2pp = 0; 330 int use_ps2pp = 0;
331 int error;
331 332
332 param[0] = 0; 333 param[0] = 0;
333 ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES); 334 ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
@@ -393,8 +394,14 @@ int ps2pp_init(struct psmouse *psmouse, int set_properties)
393 psmouse->set_resolution = ps2pp_set_resolution; 394 psmouse->set_resolution = ps2pp_set_resolution;
394 psmouse->disconnect = ps2pp_disconnect; 395 psmouse->disconnect = ps2pp_disconnect;
395 396
396 device_create_file(&psmouse->ps2dev.serio->dev, 397 error = device_create_file(&psmouse->ps2dev.serio->dev,
397 &psmouse_attr_smartscroll.dattr); 398 &psmouse_attr_smartscroll.dattr);
399 if (error) {
400 printk(KERN_ERR
401 "logips2pp.c: failed to create smartscroll "
402 "sysfs attribute, error: %d\n", error);
403 return -1;
404 }
398 } 405 }
399 } 406 }
400 407