summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFlorian Ragwitz <rafl@debian.org>2010-04-27 00:45:10 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-05-03 23:34:13 -0700
commit225c61aad38b12924b3df5f4ef43150c0d6bae8c (patch)
treef7536da6474ba2e41949dcb4f9107965a23521a7 /drivers
parent5132088697fbfd1330facf723499091182f6ef91 (diff)
downloadlinux-225c61aad38b12924b3df5f4ef43150c0d6bae8c.tar.bz2
Input: elantech - fix firmware version check
The check determining whether device should use 4- or 6-byte packets was trying to compare firmware with 2.48, but was failing on majors greater than 2. The new check ensures that versions like 4.1 are checked properly. Signed-off-by: Florian Ragwitz <rafl@debian.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/mouse/elantech.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index b27684f267bf..28eba48e68fd 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -665,7 +665,8 @@ int elantech_init(struct psmouse *psmouse)
* Assume every version greater than this is new EeePC style
* hardware with 6 byte packets
*/
- if (etd->fw_version_maj >= 0x02 && etd->fw_version_min >= 0x30) {
+ if ((etd->fw_version_maj == 0x02 && etd->fw_version_min >= 0x30) ||
+ etd->fw_version_maj > 0x02) {
etd->hw_version = 2;
/* For now show extra debug information */
etd->debug = 1;