diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-06-02 10:40:50 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-22 16:55:52 -0700 |
| commit | 615719057c4c7aad498126dd0339ba7810140a8e (patch) | |
| tree | 8796c00d888f395901fd45e01154f0e2d67100b1 | |
| parent | c24f1e7c07b48d9b36e6e370caceb7b7d75a976f (diff) | |
| download | linux-stable-615719057c4c7aad498126dd0339ba7810140a8e.tar.gz linux-stable-615719057c4c7aad498126dd0339ba7810140a8e.tar.bz2 linux-stable-615719057c4c7aad498126dd0339ba7810140a8e.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 dbd4f5ad3343..02099afb6c79 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1241,10 +1241,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++) |