diff options
author | Hans de Goede <hdegoede@redhat.com> | 2014-09-08 17:39:52 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-09-08 17:58:11 -0400 |
commit | 271329b3c798b2102120f5df829071c211ef00ed (patch) | |
tree | 311462ddf95de7d324f7226ee38b9a224692182b /drivers/input | |
parent | a2418fc4a13b5da8d007a038c0a6a50a54edfabd (diff) |
Input: elantech - fix detection of touchpad on ASUS s301l
Adjust Elantech signature validation to account fo rnewer models of
touchpads.
Cc: stable@vger.kernel.org
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>
Diffstat (limited to 'drivers/input')
-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 da51738eb59e..d71bd3635de1 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c | |||
@@ -1331,6 +1331,13 @@ static bool elantech_is_signature_valid(const unsigned char *param) | |||
1331 | if (param[1] == 0) | 1331 | if (param[1] == 0) |
1332 | return true; | 1332 | return true; |
1333 | 1333 | ||
1334 | /* | ||
1335 | * Some models have a revision higher then 20. Meaning param[2] may | ||
1336 | * be 10 or 20, skip the rates check for these. | ||
1337 | */ | ||
1338 | if (param[0] == 0x46 && (param[1] & 0xef) == 0x0f && param[2] < 40) | ||
1339 | return true; | ||
1340 | |||
1334 | for (i = 0; i < ARRAY_SIZE(rates); i++) | 1341 | for (i = 0; i < ARRAY_SIZE(rates); i++) |
1335 | if (param[2] == rates[i]) | 1342 | if (param[2] == rates[i]) |
1336 | return false; | 1343 | return false; |