summaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/elantech.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-05-13 09:41:15 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-05-13 09:43:19 +0200
commit504e8beed161bd11a2c6cbb8aaf352c14d39b5bb (patch)
treee9fa1e22d917fafc4a8ec005934f4b19f2d834ac /drivers/input/mouse/elantech.h
parentInput: iforce - fix Guillemot Jet Leader 3D entry (diff)
downloadlinux-504e8beed161bd11a2c6cbb8aaf352c14d39b5bb.tar.xz
linux-504e8beed161bd11a2c6cbb8aaf352c14d39b5bb.zip
Input: elantech - use all 3 bytes when checking version
Apparently all 3 bytes returned by ETP_FW_VERSION_QUERY are significant and should be taken into account when matching hardware version/features. Tested-by: Eric Piel <eric.piel@tremplin-utc.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to '')
-rw-r--r--drivers/input/mouse/elantech.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
index feac5f7af966..ac57bde1bb9f 100644
--- a/drivers/input/mouse/elantech.h
+++ b/drivers/input/mouse/elantech.h
@@ -100,11 +100,10 @@ struct elantech_data {
unsigned char reg_26;
unsigned char debug;
unsigned char capabilities;
- unsigned char fw_version_maj;
- unsigned char fw_version_min;
- unsigned char hw_version;
unsigned char paritycheck;
unsigned char jumpy_cursor;
+ unsigned char hw_version;
+ unsigned int fw_version;
unsigned char parity[256];
};