diff options
author | Hans de Goede <hdegoede@redhat.com> | 2014-09-08 14:39:52 -0700 |
---|---|---|
committer | Zefan Li <lizefan@huawei.com> | 2014-12-01 18:02:27 +0800 |
commit | 32b45e0ec8c6d1b613e074adc13385d4c63769a4 (patch) | |
tree | 1dd10d094f543f22a964262bae61a9d27644cb13 /drivers | |
parent | 488d89601e77e23b18755a0563579b67d950d9fb (diff) |
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: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/mouse/elantech.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index d93ea6417d15..f2c2ffedeff5 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1218,6 +1218,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; |