Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Input: elantech - make sure touchpad is really in absolute mode

Browse Source 
There exist laptops with Elantech touchpads where switching to absolute mode
does not happen, although writing the configuration register succeeds
without error. Reading back the register afterwards reveils that the
absolute mode bit is not set as if masked out by the touchpad firmware.

Always read back register 0x10, make sure that for hardware version 1 the
absolute mode bit is actually set and fail otherwise. This prevents the case
where the touchpad is claimed by the Elantech driver but is nonetheless not
working.

Signed-off-by: Arjan Opmeer <arjan@opmeer.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Arjan Opmeer 2009-04-18 19:10:17 -07:00 committed by Dmitry Torokhov
parent 3f8c0df43d
commit b2546df69b
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/input/mouse/elantech.c
View File

@ -375,9 +375,14 @@ static int elantech_set_absolute_mode(struct psmouse *psmouse)
rc = -1; rc = -1;
break; break;
} }
}
if (rc == 0) {
/* /*
* Read back reg 0x10. The touchpad is probably initalising * Read back reg 0x10. For hardware version 1 we must make
* and not ready until we read back the value we just wrote. * sure the absolute mode bit is set. For hardware version 2
* the touchpad is probably initalising and not ready until
* we read back the value we just wrote.
*/ */
do { do {
rc = elantech_read_reg(psmouse, 0x10, &val); rc = elantech_read_reg(psmouse, 0x10, &val);
@ -385,12 +390,18 @@ static int elantech_set_absolute_mode(struct psmouse *psmouse)
break; break;
tries--; tries--;
elantech_debug("elantech.c: retrying read (%d).\n", elantech_debug("elantech.c: retrying read (%d).\n",
tries); tries);
msleep(ETP_READ_BACK_DELAY); msleep(ETP_READ_BACK_DELAY);
} while (tries > 0); } while (tries > 0);
if (rc)
if (rc) {
pr_err("elantech.c: failed to read back register 0x10.\n"); pr_err("elantech.c: failed to read back register 0x10.\n");
break; } else if (etd->hw_version == 1 &&
!(val & ETP_R10_ABSOLUTE_MODE)) {
pr_err("elantech.c: touchpad refuses "
"to switch to absolute mode.\n");
rc = -1;
}
} }
if (rc) if (rc)