From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752437AbbCWLmb (ORCPT ); Mon, 23 Mar 2015 07:42:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57679 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752145AbbCWLma (ORCPT ); Mon, 23 Mar 2015 07:42:30 -0400 Message-ID: <550FFC21.1000503@redhat.com> Date: Mon, 23 Mar 2015 12:42:25 +0100 From: Hans de Goede User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: =?UTF-8?B?UGFsaSBSb2jDoXI=?= , Dmitry Torokhov CC: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] Input: ALPS - Report v3 pinnacle trackstick device only if is present References: <1427032068-13066-1-git-send-email-pali.rohar@gmail.com> In-Reply-To: <1427032068-13066-1-git-send-email-pali.rohar@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Looks good: Acked-by: Hans de Goede Regards, Hans > --- > 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: >