aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-09-08 14:39:52 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-05 14:54:12 -0700
commit9ec354827ed22cfdbbe7d597f937df3bbe384bbc (patch)
tree2f359420bd50812328b3a522045fa857ade188e0
parent13ea4bd23a2d6abb0d6bab9e138cecb4f55fe211 (diff)
downloadlinux-linaro-stable-9ec354827ed22cfdbbe7d597f937df3bbe384bbc.tar.gz
Input: elantech - fix detection of touchpad on ASUS s301l
commit 271329b3c798b2102120f5df829071c211ef00ed upstream. Adjust Elantech signature validation to account fo rnewer models of touchpads. Reported-and-tested-by: Màrius Monton <marius.monton@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/input/mouse/elantech.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 1913301df08f..85e75239c814 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1223,6 +1223,13 @@ static bool elantech_is_signature_valid(const unsigned char *param)
if (param[1] == 0)
return true;
+ /*
+ * Some models have a revision higher then 20. Meaning param[2] may
+ * be 10 or 20, skip the rates check for these.
+ */
+ if (param[0] == 0x46 && (param[1] & 0xef) == 0x0f && param[2] < 40)
+ return true;
+
for (i = 0; i < ARRAY_SIZE(rates); i++)
if (param[2] == rates[i])
return false;