diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-06-02 10:40:50 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-06-23 14:55:11 +0200 |
| commit | bc2990ca6c55f98dab00d90d32649bec039ff111 (patch) | |
| tree | bbd3ad5627155957d04cbda0130efbf55863f1f5 | |
| parent | d00b7b6be65c096f65beb829c1b6fd010c026e8b (diff) | |
| download | lwn-bc2990ca6c55f98dab00d90d32649bec039ff111.tar.gz lwn-bc2990ca6c55f98dab00d90d32649bec039ff111.zip | |
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: Jiri Slaby <jslaby@suse.cz>
| -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 71540c0eee44..65945db35377 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1273,10 +1273,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++) |