aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorJordan Rife <jrife0@gmail.com>2014-04-22 17:44:51 -0700
committerBen Hutchings <ben@decadent.org.uk>2015-08-07 00:32:15 +0100
commit5a0df908a3c8dbd7244d06ee8598bfe9b6dc721f (patch)
tree33d3474847faae94b59f042b5e1418e7f93d1137 /drivers/input
parent4881050ef0c893d76ca8bcd163402cc60514300f (diff)
downloadkernel_samsung_smdk4412-5a0df908a3c8dbd7244d06ee8598bfe9b6dc721f.zip
kernel_samsung_smdk4412-5a0df908a3c8dbd7244d06ee8598bfe9b6dc721f.tar.gz
kernel_samsung_smdk4412-5a0df908a3c8dbd7244d06ee8598bfe9b6dc721f.tar.bz2
Input: elantech - add support for newer elantech touchpads
commit ae4bedf0679d99f0a9b80a7ea9b8dd205de05d06 upstream. Newer elantech touchpads are not recognized by the current driver, since it fails to detect their firmware version number. This prevents more advanced touchpad features from being usable such as two-finger scrolling. This patch allows newer touchpads to be detected and be fully functional. Tested on Sony Vaio SVF13N17PXB. Signed-off-by: Jordan Rife <jrife0@gmail.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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index b2a6db7..17788b0 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1287,6 +1287,7 @@ static int elantech_set_properties(struct elantech_data *etd)
case 6:
case 7:
case 8:
+ case 9:
etd->hw_version = 4;
break;
default: