diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-06-02 10:40:50 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-07 00:32:14 +0100 |
| commit | 47188f4e51c0dc5b84457e247800bdf1d31c63d4 (patch) | |
| tree | 0af33209a5b2798ac7c48d19088e2f323fc50b23 /drivers/input | |
| parent | 8dfc8b9e8432f50606820b40a7d63618d9d61a07 (diff) | |
| download | kernel_samsung_smdk4412-47188f4e51c0dc5b84457e247800bdf1d31c63d4.zip kernel_samsung_smdk4412-47188f4e51c0dc5b84457e247800bdf1d31c63d4.tar.gz kernel_samsung_smdk4412-47188f4e51c0dc5b84457e247800bdf1d31c63d4.tar.bz2 | |
Input: elantech - fix detection of touchpads where the revision matches a known rate
commit 5f0ee9d17aae628b22be86966471db65be21f262 upstream.
Make the check to skip the rate check more lax, so that it applies
to all hw_version 4 models.
This fixes the touchpad not being detected properly on Asus PU551LA
laptops.
Reported-and-tested-by: David Zafra Gómez <dezeta@klo.es>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/elantech.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 00a7889..6df9c8a 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1146,10 +1146,11 @@ static bool elantech_is_signature_valid(const unsigned char *param) return true; /* - * Some models have a revision higher then 20. Meaning param[2] may - * be 10 or 20, skip the rates check for these. + * Some hw_version >= 4 models have a revision higher then 20. Meaning + * that param[2] may be 10 or 20, skip the rates check for these. */ - if (param[0] == 0x46 && (param[1] & 0xef) == 0x0f && param[2] < 40) + if ((param[0] & 0x0f) >= 0x06 && (param[1] & 0xaf) == 0x0f && + param[2] < 40) return true; for (i = 0; i < ARRAY_SIZE(rates); i++) |