On Wednesday 15 November 2017 14:34:04 Aaron Ma wrote: > 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: <sta...@vger.kernel.org> > Signed-off-by: Aaron Ma <aaron...@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);
Masaki Ota, please look at this patch as it partially revert your commit 4a646580f793 ("Input: ALPS - fix two-finger scroll breakage"). Something smells here. -- Pali Rohár pali.ro...@gmail.com