linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Input: ALPS - fix DualPoint flag for 74 03 28 devices
@ 2017-11-15  6:34 Aaron Ma
  2017-11-15  8:35 ` Pali Rohár
  0 siblings, 1 reply; 9+ messages in thread
From: Aaron Ma @ 2017-11-15  6:34 UTC (permalink / raw)
  To: linux-input, linux-kernel, dmitry.torokhov, masaki.ota, pali.rohar

There is a regression of commit 4a646580f793 ("Input: ALPS - fix
two-finger scroll breakage"), ALPS device fails with log:

psmouse serio1: alps: Rejected trackstick packet from non DualPoint device

ALPS device with id "74 03 28" report OTP[0] data 0xCE after
commit 4a646580f793, after restore the OTP reading order,
it becomes to 0x10 as before and reports the right flag.

Fixes: 4a646580f793 ("Input: ALPS - fix two-finger scroll breakage")
Cc: <stable@vger.kernel.org>
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
---
 drivers/input/mouse/alps.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 579b899add26..c59b8f7ca2fc 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -2562,8 +2562,8 @@ static int alps_set_defaults_ss4_v2(struct psmouse *psmouse,
 
 	memset(otp, 0, sizeof(otp));
 
-	if (alps_get_otp_values_ss4_v2(psmouse, 1, &otp[1][0]) ||
-	    alps_get_otp_values_ss4_v2(psmouse, 0, &otp[0][0]))
+	if (alps_get_otp_values_ss4_v2(psmouse, 0, &otp[0][0]) ||
+	    alps_get_otp_values_ss4_v2(psmouse, 1, &otp[1][0]))
 		return -1;
 
 	alps_update_device_area_ss4_v2(otp, priv);
-- 
2.13.6

^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2018-03-28  7:38 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-15  6:34 [PATCH] Input: ALPS - fix DualPoint flag for 74 03 28 devices Aaron Ma
2017-11-15  8:35 ` Pali Rohár
2017-11-16  7:27   ` Masaki Ota
2017-11-16  9:07     ` Aaron Ma
2018-01-29 22:51     ` dmitry.torokhov
2018-03-20 18:47       ` Dmitry Torokhov
2018-03-25 21:25         ` Pali Rohár
2018-03-27  4:37           ` Masaki Ota
2018-03-28  7:38             ` Pali Rohár

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).