From: "Pali Rohár" <pali.rohar@gmail.com>
To: Hans de Goede <hdegoede@redhat.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
linux-input@vger.kernel.org, Santiago Gala <sgala@apache.org>,
Yunkang Tang <yunkang.tang@cn.alps.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Input: ALPS - fix max coordinates for v5 and v7 protocols
Date: Sun, 22 Mar 2015 13:33:09 +0100 [thread overview]
Message-ID: <201503221333.10049@pali> (raw)
In-Reply-To: <550E9DF1.60507@redhat.com>
[-- Attachment #1: Type: Text/Plain, Size: 2220 bytes --]
On Sunday 22 March 2015 11:48:17 Hans de Goede wrote:
> Hi,
>
> On 22-03-15 04:36, Dmitry Torokhov wrote:
> > 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@apache.org>
> > Reported-by: Pali Rohár <pali.rohar@gmail.com>
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>
> Fix looks good to me:
>
> Acked-by: Hans de Goede <hdegoede@redhat.com>
>
> Regards,
>
> Hans
>
Looks good also for me...
Acked-by: Pali Rohár <pali.rohar@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 1bd15eb..33198b9 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;
--
Pali Rohár
pali.rohar@gmail.com
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2015-03-22 12:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-22 3:36 [PATCH] Input: ALPS - fix max coordinates for v5 and v7 protocols Dmitry Torokhov
2015-03-22 10:48 ` Hans de Goede
2015-03-22 12:33 ` Pali Rohár [this message]
2015-03-31 3:47 ` Luca Coelho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201503221333.10049@pali \
--to=pali.rohar@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=hdegoede@redhat.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sgala@apache.org \
--cc=yunkang.tang@cn.alps.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).