Commit fb4f8f56 authored by Hans de Goede's avatar Hans de Goede Committed by Dmitry Torokhov

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: default avatarJames Lademann <jwlademann@gmail.com>
Tested-by: default avatarPhilipp Wolfer <ph.wolfer@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent cd9e83e2
...@@ -849,7 +849,7 @@ static int elantech_set_absolute_mode(struct psmouse *psmouse) ...@@ -849,7 +849,7 @@ static int elantech_set_absolute_mode(struct psmouse *psmouse)
if (etd->set_hw_resolution) if (etd->set_hw_resolution)
etd->reg_10 = 0x0b; etd->reg_10 = 0x0b;
else else
etd->reg_10 = 0x03; etd->reg_10 = 0x01;
if (elantech_write_reg(psmouse, 0x10, etd->reg_10)) if (elantech_write_reg(psmouse, 0x10, etd->reg_10))
rc = -1; rc = -1;
...@@ -1350,7 +1350,8 @@ static int elantech_reconnect(struct psmouse *psmouse) ...@@ -1350,7 +1350,8 @@ static int elantech_reconnect(struct psmouse *psmouse)
} }
/* /*
* Some hw_version 3 models go into error state when we try to set bit 3 of r10 * Some hw_version 3 models go into error state when we try to set
* bit 3 and/or bit 1 of r10.
*/ */
static const struct dmi_system_id no_hw_res_dmi_table[] = { static const struct dmi_system_id no_hw_res_dmi_table[] = {
#if defined(CONFIG_DMI) && defined(CONFIG_X86) #if defined(CONFIG_DMI) && defined(CONFIG_X86)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment