Skip to content

Commit

Permalink
Input: elantech - reset touchpad before configuring it
Browse files Browse the repository at this point in the history
Acer VH40 has a Fn key toggling the touchpad on and off, but it's
implemented in system firmware, and the EC chip has to receive
reset command to activate this function. Also when this machine
wakes up after resume, psmouse_reset is necessary to bring the
touchpad back on.

Signed-off-by: JJ Ding <jj_ding@emc.com.tw>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
JJ Ding authored and Dmitry Torokhov committed Apr 10, 2012
1 parent d626dad commit a67ada7
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/input/mouse/elantech.c
Original file line number Diff line number Diff line change
Expand Up @@ -1245,6 +1245,8 @@ static void elantech_disconnect(struct psmouse *psmouse)
*/
static int elantech_reconnect(struct psmouse *psmouse)
{
psmouse_reset(psmouse);

if (elantech_detect(psmouse, 0))
return -1;

Expand Down Expand Up @@ -1324,6 +1326,8 @@ int elantech_init(struct psmouse *psmouse)
if (!etd)
return -ENOMEM;

psmouse_reset(psmouse);

etd->parity[0] = 1;
for (i = 1; i < 256; i++)
etd->parity[i] = etd->parity[i & (i - 1)] ^ 1;
Expand Down

0 comments on commit a67ada7

Please sign in to comment.