Thread (8 messages) 8 messages, 2 authors, 2014-08-26

[PATCH RESEND v4 2/2] elantech: Call psmouse_reset when elantech probe fails

flat view
STALE4424d REVIEWED: 1 (0M)

From: Ulrik De Bie <hidden>
Date: 2014-08-20 18:57:18
Subsystem: input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers: Dmitry Torokhov, Linus Torvalds

Revision v4 of 3 in this series; 1 review trailer.

Revisions (3)
  1. v3 [diff vs current]
  2. v4 [diff vs current]
  3. v4 current
elantech_init() calls elantech_set_absolute_mode which sets the driver in
an absolute mode. When after this the elantech_init fails, it is best
to turn the ps/2 mouse emulation mode back on by calling psmouse_reset()
so that it can work as a regular mouse.

Reviewed-by: Hans de Goede <redacted>
Signed-off-by: Ulrik De Bie <redacted>
---
 drivers/input/mouse/elantech.c | 1 +
 1 file changed, 1 insertion(+)
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 5dd620a..771291c 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1620,6 +1620,7 @@ int elantech_init(struct psmouse *psmouse)
 	sysfs_remove_group(&psmouse->ps2dev.serio->dev.kobj,
 			   &elantech_attr_group);
  init_fail:
+	psmouse_reset(psmouse);
 	kfree(etd);
 	return error;
 }
-- 
2.1.0.rc1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help