This is a note to let you know that I've just added the patch titled

    Input: elantech - fix firmware version check

to the 2.6.32-longterm tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.32.git;a=summary

The filename of the patch is:
     input-elantech-fix-firmware-version-check.patch
and it can be found in the queue-2.6.32 subdirectory.

If you, or anyone else, feels it should not be added to the 2.6.32 longterm 
tree,
please let <[email protected]> know about it.


>From 4e74ec140f7b4dd5c04c318d8666a2381807a2c8 Mon Sep 17 00:00:00 2001
From: Florian Ragwitz <[email protected]>
Date: Tue, 27 Apr 2010 00:45:10 -0700
Subject: Input: elantech - fix firmware version check

From: Florian Ragwitz <[email protected]>

commit 225c61aad38b12924b3df5f4ef43150c0d6bae8c upstream.

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 <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/input/mouse/elantech.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -665,7 +665,8 @@ int elantech_init(struct psmouse *psmous
         * 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;


Patches currently in longterm-queue-2.6.32 which might be from [email protected] 
are

/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/input-elantech-fix-firmware-version-check.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/input-elantech-allow-forcing-elantech-protocol.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/input-elantech-ignore-high-bits-in-the-position-coor.patch

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to