aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrik De Bie <ulrik.debie-os@e2big.org>2014-08-22 20:08:21 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-08-26 18:17:36 -0400
commitac84eba220c401f7616237ee6e5b73f66afb3590 (patch)
treef5e0158822ee117cd3a368ea358fec2318720c72
parenta9e06219df9ce92567aa1cb3dd5e0bb498afb93b (diff)
Input: elantech - reset the device when elantech probe fails
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 <hdegoede@redhat.com> Signed-off-by: Ulrik De Bie <ulrik.debie-os@e2big.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/mouse/elantech.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index ee2a04d90d20..15c5f304f7e7 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1506,6 +1506,7 @@ int elantech_init(struct psmouse *psmouse)
1506 return 0; 1506 return 0;
1507 1507
1508 init_fail: 1508 init_fail:
1509 psmouse_reset(psmouse);
1509 kfree(etd); 1510 kfree(etd);
1510 return -1; 1511 return -1;
1511} 1512}