From a8e679fa10c60e53205a4202647fb7612ca1f9e7 Mon Sep 17 00:00:00 2001
From: Florian Ragwitz <rafl@debian.org>
Date: Tue, 27 Apr 2010 00:45:10 -0700
Subject: [PATCH] --- yaml --- r: 190586 b: refs/heads/master c:
 225c61aad38b12924b3df5f4ef43150c0d6bae8c h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/input/mouse/elantech.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 72f1d97e5c95..13494b8561a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5132088697fbfd1330facf723499091182f6ef91
+refs/heads/master: 225c61aad38b12924b3df5f4ef43150c0d6bae8c
diff --git a/trunk/drivers/input/mouse/elantech.c b/trunk/drivers/input/mouse/elantech.c
index b27684f267bf..28eba48e68fd 100644
--- a/trunk/drivers/input/mouse/elantech.c
+++ b/trunk/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;