[kernel/f16] Include commit 3940d6185 from JJ Ding in elantech.patch

[Josh Boyer]

commit a6a5351a6faf6ad95d35ccccdc074ba943800a2c
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed Nov 30 10:32:45 2011 -0500

    Include commit 3940d6185 from JJ Ding in elantech.patch

 elantech.patch |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 kernel.spec    |    5 +++-
 2 files changed, 68 insertions(+), 1 deletions(-)
---
diff --git a/elantech.patch b/elantech.patch
index 255efd2..fa7c67f 100644
--- a/elantech.patch
+++ b/elantech.patch
@@ -2114,3 +2114,67 @@ index c2d91eb..25290b3 100644
 -- 
 1.7.6.4
 
+From 3940d6185a982a970ff562e085caccbdd62f40bb Mon Sep 17 00:00:00 2001
+From: JJ Ding <jj_ding at emc.com.tw>
+Date: Tue, 8 Nov 2011 22:13:14 -0800
+Subject: [PATCH] Input: elantech - adjust hw_version detection logic
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch fixes some v3 hardware (fw_version: 0x150500) wrongly detected
+as v2 hardware.
+
+Reported-by: Marc Dietrich <marvin24 at gmx.de>
+Signed-off-by: JJ Ding <jj_ding at emc.com.tw>
+Tested-By: Marc Dietrich <marvin24 at gmx.de>
+Acked-by: Éric Piel <eric.piel at tremplin-utc.net>
+Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
+---
+ drivers/input/mouse/elantech.c |   26 ++++++++++++++++++--------
+ 1 files changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
+index 09b93b1..e2a9867 100644
+--- a/drivers/input/mouse/elantech.c
++++ b/drivers/input/mouse/elantech.c
+@@ -1210,18 +1210,28 @@ static int elantech_reconnect(struct psmouse *psmouse)
+  */
+ static int elantech_set_properties(struct elantech_data *etd)
+ {
++	/* This represents the version of IC body. */
+ 	int ver = (etd->fw_version & 0x0f0000) >> 16;
+ 
++	/* Early version of Elan touchpads doesn't obey the rule. */
+ 	if (etd->fw_version < 0x020030 || etd->fw_version == 0x020600)
+ 		etd->hw_version = 1;
+-	else if (etd->fw_version < 0x150600)
+-		etd->hw_version = 2;
+-	else if (ver == 5)
+-		etd->hw_version = 3;
+-	else if (ver == 6)
+-		etd->hw_version = 4;
+-	else
+-		return -1;
++	else {
++		switch (ver) {
++		case 2:
++		case 4:
++			etd->hw_version = 2;
++			break;
++		case 5:
++			etd->hw_version = 3;
++			break;
++		case 6:
++			etd->hw_version = 4;
++			break;
++		default:
++			return -1;
++		}
++	}
+ 
+ 	/*
+ 	 * Turn on packet checking by default.
+-- 
+1.7.7.3
+
diff --git a/kernel.spec b/kernel.spec
index 4fe3e41..d60e469 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 3
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2188,6 +2188,9 @@ fi
 # and build.
 
 %changelog
+* Wed Nov 30 2011 Josh Boyer <jwboyer at redhat.com>
+- Include commit 3940d6185 from JJ Ding in elantech.patch
+
 * Tue Nov 29 2011 Josh Boyer <jwboyer at redhat.com>
 - Add patch to fix deadlock in rtlwifi (rhbz #755154)
 - Drop drm-intel-make-lvds-work.patch (rhbz #731296)