jwboyer pushed to kernel (master). "Fix ALPS v5 and v7 trackpads (rhbz 1203584)"

[notifications at fedoraproject.org]

jwboyer pushed to kernel (master).  "Fix ALPS v5 and v7 trackpads (rhbz 1203584)"

>From 243dfca335a9a6fc0a9c4d66dfd5f5c0739a5ba3 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer at fedoraproject.org>
Date: Tue, 24 Mar 2015 12:33:03 -0400
Subject: Fix ALPS v5 and v7 trackpads (rhbz 1203584)


diff --git a/Input-ALPS-fix-max-coordinates-for-v5-and-v7-protoco.patch b/Input-ALPS-fix-max-coordinates-for-v5-and-v7-protoco.patch
new file mode 100644
index 0000000..84ca0a8
--- /dev/null
+++ b/Input-ALPS-fix-max-coordinates-for-v5-and-v7-protoco.patch
@@ -0,0 +1,54 @@
+From: Dmitry Torokhov <dmitry.torokhov at gmail.com>
+Date: Sat, 21 Mar 2015 20:36:56 -0700
+Subject: [PATCH] Input: ALPS - fix max coordinates for v5 and v7 protocols
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit 3296f71cd2fde7a2ad52e66a27eae419f6328066 ("Input: ALPS - consolidate
+setting protocol parameters") inadvertently moved call to
+alps_dolphin_get_device_area() from v5 to v7 protocol, causing both
+protocols report incorrect maximum values for X and Y axes which resulted
+in crash in Synaptics X driver.
+
+Reported-by: Santiago Gala <sgala at apache.org>
+Reported-by: Pali Rohár <pali.rohar at gmail.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov at gmail.com>
+---
+ drivers/input/mouse/alps.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
+index 1bd15ebc01f2..33198b91bebf 100644
+--- a/drivers/input/mouse/alps.c
++++ b/drivers/input/mouse/alps.c
+@@ -2281,10 +2281,12 @@ static int alps_set_protocol(struct psmouse *psmouse,
+ 		priv->set_abs_params = alps_set_abs_params_mt;
+ 		priv->nibble_commands = alps_v3_nibble_commands;
+ 		priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
+-		priv->x_max = 1360;
+-		priv->y_max = 660;
+ 		priv->x_bits = 23;
+ 		priv->y_bits = 12;
++
++		if (alps_dolphin_get_device_area(psmouse, priv))
++			return -EIO;
++
+ 		break;
+ 
+ 	case ALPS_PROTO_V6:
+@@ -2303,9 +2305,8 @@ static int alps_set_protocol(struct psmouse *psmouse,
+ 		priv->set_abs_params = alps_set_abs_params_mt;
+ 		priv->nibble_commands = alps_v3_nibble_commands;
+ 		priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
+-
+-		if (alps_dolphin_get_device_area(psmouse, priv))
+-			return -EIO;
++		priv->x_max = 0xfff;
++		priv->y_max = 0x7ff;
+ 
+ 		if (priv->fw_ver[1] != 0xba)
+ 			priv->flags |= ALPS_BUTTONPAD;
+-- 
+2.1.0
+
diff --git a/kernel.spec b/kernel.spec
index 3af55f2..24d00fa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -630,6 +630,9 @@ Patch26171: acpi-video-Add-force-native-backlight-quirk-for-Leno.patch
 Patch26172: drm-Fixup-racy-refcounting-in-plane_force_disable.patch
 Patch26173: drm-i915-Don-t-try-to-reference-the-fb-in-get_initia.patch
 
+#rhbz 1203584
+Patch26174: Input-ALPS-fix-max-coordinates-for-v5-and-v7-protoco.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1371,6 +1374,9 @@ ApplyPatch acpi-video-Add-force-native-backlight-quirk-for-Leno.patch
 ApplyPatch drm-Fixup-racy-refcounting-in-plane_force_disable.patch
 ApplyPatch drm-i915-Don-t-try-to-reference-the-fb-in-get_initia.patch
 
+#rhbz 1203584
+ApplyPatch Input-ALPS-fix-max-coordinates-for-v5-and-v7-protoco.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2221,6 +2227,9 @@ fi
 #
 # 
 %changelog
+* Tue Mar 24 2015 Josh Boyer <jwboyer at fedoraproject.org>
+- Fix ALPS v5 and v7 trackpads (rhbz 1203584)
+
 * Tue Mar 24 2015 Josh Boyer <jwboyer at fedoraproject.org> - 4.0.0-0.rc5.git1.3
 - Linux v4.0-rc5-25-g90a5a895cc8b
 - Add some i915 fixes
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kernel.git/commit/?h=master&id=243dfca335a9a6fc0a9c4d66dfd5f5c0739a5ba3

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390