diff options
author | Hans de Goede <hdegoede@redhat.com> | 2014-06-08 02:07:13 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 02:20:23 -0400 |
commit | fb4f8f568a9def02240ef9bf7aabd246dc63a081 (patch) | |
tree | 622e71a868fa30ecb154af762fcae549d02266a8 | |
parent | cd9e83e2754465856097f31c7ab933ce74c473f8 (diff) |
Input: elantech - don't set bit 1 of reg_10 when the no_hw_res quirk is set
The touchpad on the GIGABYTE U2442 not only stops communicating when we try
to set bit 3 (enable real hardware resolution) of reg_10, but on some BIOS
versions also when we set bit 1 (enable two finger mode auto correct).
I've asked the original reporter of:
https://bugzilla.kernel.org/show_bug.cgi?id=61151
To check that not setting bit 1 does not lead to any adverse effects on his
model / BIOS revision, and it does not, so this commit fixes the touchpad
not working on these versions by simply never setting bit 1 for laptop
models with the no_hw_res quirk.
Reported-and-tested-by: James Lademann <jwlademann@gmail.com>
Tested-by: Philipp Wolfer <ph.wolfer@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | drivers/input/mouse/elantech.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 9640232a868d..ee2a04d90d20 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c | |||
@@ -849,7 +849,7 @@ static int elantech_set_absolute_mode(struct psmouse *psmouse) | |||
849 | if (etd->set_hw_resolution) | 849 | if (etd->set_hw_resolution) |
850 | etd->reg_10 = 0x0b; | 850 | etd->reg_10 = 0x0b; |
851 | else | 851 | else |
852 | etd->reg_10 = 0x03; | 852 | etd->reg_10 = 0x01; |
853 | 853 | ||
854 | if (elantech_write_reg(psmouse, 0x10, etd->reg_10)) | 854 | if (elantech_write_reg(psmouse, 0x10, etd->reg_10)) |
855 | rc = -1; | 855 | rc = -1; |
@@ -1350,7 +1350,8 @@ static int elantech_reconnect(struct psmouse *psmouse) | |||
1350 | } | 1350 | } |
1351 | 1351 | ||
1352 | /* | 1352 | /* |
1353 | * Some hw_version 3 models go into error state when we try to set bit 3 of r10 | 1353 | * Some hw_version 3 models go into error state when we try to set |
1354 | * bit 3 and/or bit 1 of r10. | ||
1354 | */ | 1355 | */ |
1355 | static const struct dmi_system_id no_hw_res_dmi_table[] = { | 1356 | static const struct dmi_system_id no_hw_res_dmi_table[] = { |
1356 | #if defined(CONFIG_DMI) && defined(CONFIG_X86) | 1357 | #if defined(CONFIG_DMI) && defined(CONFIG_X86) |