From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: "Pali Rohár" <pali.rohar@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Input: ALPS - Report v3 pinnacle trackstick device only if is present
Date: Wed, 6 Jan 2016 16:00:33 -0800 [thread overview]
Message-ID: <20160107000033.GB3129@dtor-ws> (raw)
In-Reply-To: <20160105165419.GQ22661@pali>
On Tue, Jan 05, 2016 at 05:54:19PM +0100, Pali Rohár wrote:
> On Monday 23 March 2015 12:42:25 Hans de Goede wrote:
> > Hi,
> >
> > On 22-03-15 14:47, Pali Rohár wrote:
> > >This patch move v3 pinnacle code for trackstick detection from alps_hw_init_v3()
> > >to alps_set_protocol() so ALPS_DUALPOINT flag can be cleared before registering
> > >trackstick input device in kernel.
> > >
> > >Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
> >
> > Looks good:
> >
> > Acked-by: Hans de Goede <hdegoede@redhat.com>
> >
> > Regards,
> >
> > Hans
> >
>
> Hi Hans! I would like to remind this patch as it stays here on ML.
Applied, thank you.
>
> >
> > >---
> > > drivers/input/mouse/alps.c | 12 +++++++-----
> > > 1 file changed, 7 insertions(+), 5 deletions(-)
> > >
> > >diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
> > >index c9cd27a..d24e98d 100644
> > >--- a/drivers/input/mouse/alps.c
> > >+++ b/drivers/input/mouse/alps.c
> > >@@ -1877,15 +1877,12 @@ error:
> > >
> > > static int alps_hw_init_v3(struct psmouse *psmouse)
> > > {
> > >+ struct alps_data *priv = psmouse->private;
> > > struct ps2dev *ps2dev = &psmouse->ps2dev;
> > > int reg_val;
> > > unsigned char param[4];
> > >
> > >- reg_val = alps_probe_trackstick_v3_v7(psmouse, ALPS_REG_BASE_PINNACLE);
> > >- if (reg_val == -EIO)
> > >- goto error;
> > >-
> > >- if (reg_val == 0 &&
> > >+ if ((priv->flags & ALPS_DUALPOINT) &&
> > > alps_setup_trackstick_v3(psmouse, ALPS_REG_BASE_PINNACLE) == -EIO)
> > > goto error;
> > >
> > >@@ -2249,6 +2246,11 @@ static int alps_set_protocol(struct psmouse *psmouse,
> > > priv->decode_fields = alps_decode_pinnacle;
> > > priv->nibble_commands = alps_v3_nibble_commands;
> > > priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
> > >+
> > >+ if (alps_probe_trackstick_v3_v7(psmouse,
> > >+ ALPS_REG_BASE_PINNACLE) < 0)
> > >+ priv->flags &= ~ALPS_DUALPOINT;
> > >+
> > > break;
> > >
> > > case ALPS_PROTO_V3_RUSHMORE:
> > >
>
> --
> Pali Rohár
> pali.rohar@gmail.com
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: "Pali Rohár" <pali.rohar@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Input: ALPS - Report v3 pinnacle trackstick device only if is present
Date: Wed, 6 Jan 2016 16:00:33 -0800 [thread overview]
Message-ID: <20160107000033.GB3129@dtor-ws> (raw)
In-Reply-To: <20160105165419.GQ22661@pali>
On Tue, Jan 05, 2016 at 05:54:19PM +0100, Pali Rohár wrote:
> On Monday 23 March 2015 12:42:25 Hans de Goede wrote:
> > Hi,
> >
> > On 22-03-15 14:47, Pali Rohár wrote:
> > >This patch move v3 pinnacle code for trackstick detection from alps_hw_init_v3()
> > >to alps_set_protocol() so ALPS_DUALPOINT flag can be cleared before registering
> > >trackstick input device in kernel.
> > >
> > >Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
> >
> > Looks good:
> >
> > Acked-by: Hans de Goede <hdegoede@redhat.com>
> >
> > Regards,
> >
> > Hans
> >
>
> Hi Hans! I would like to remind this patch as it stays here on ML.
Applied, thank you.
>
> >
> > >---
> > > drivers/input/mouse/alps.c | 12 +++++++-----
> > > 1 file changed, 7 insertions(+), 5 deletions(-)
> > >
> > >diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
> > >index c9cd27a..d24e98d 100644
> > >--- a/drivers/input/mouse/alps.c
> > >+++ b/drivers/input/mouse/alps.c
> > >@@ -1877,15 +1877,12 @@ error:
> > >
> > > static int alps_hw_init_v3(struct psmouse *psmouse)
> > > {
> > >+ struct alps_data *priv = psmouse->private;
> > > struct ps2dev *ps2dev = &psmouse->ps2dev;
> > > int reg_val;
> > > unsigned char param[4];
> > >
> > >- reg_val = alps_probe_trackstick_v3_v7(psmouse, ALPS_REG_BASE_PINNACLE);
> > >- if (reg_val == -EIO)
> > >- goto error;
> > >-
> > >- if (reg_val == 0 &&
> > >+ if ((priv->flags & ALPS_DUALPOINT) &&
> > > alps_setup_trackstick_v3(psmouse, ALPS_REG_BASE_PINNACLE) == -EIO)
> > > goto error;
> > >
> > >@@ -2249,6 +2246,11 @@ static int alps_set_protocol(struct psmouse *psmouse,
> > > priv->decode_fields = alps_decode_pinnacle;
> > > priv->nibble_commands = alps_v3_nibble_commands;
> > > priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
> > >+
> > >+ if (alps_probe_trackstick_v3_v7(psmouse,
> > >+ ALPS_REG_BASE_PINNACLE) < 0)
> > >+ priv->flags &= ~ALPS_DUALPOINT;
> > >+
> > > break;
> > >
> > > case ALPS_PROTO_V3_RUSHMORE:
> > >
>
> --
> Pali Rohár
> pali.rohar@gmail.com
--
Dmitry
next prev parent reply other threads:[~2016-01-07 0:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-22 13:47 [PATCH] Input: ALPS - Report v3 pinnacle trackstick device only if is present Pali Rohár
2015-03-23 11:42 ` Hans de Goede
2015-03-23 11:42 ` Hans de Goede
2016-01-05 16:54 ` Pali Rohár
2016-01-05 16:54 ` Pali Rohár
2016-01-07 0:00 ` Dmitry Torokhov [this message]
2016-01-07 0:00 ` Dmitry Torokhov
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=20160107000033.GB3129@dtor-ws \
--to=dmitry.torokhov@gmail.com \
--cc=hdegoede@redhat.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pali.rohar@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.