From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751839AbbALAaq (ORCPT ); Sun, 11 Jan 2015 19:30:46 -0500 Received: from mail-ig0-f176.google.com ([209.85.213.176]:39880 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751043AbbALAao (ORCPT ); Sun, 11 Jan 2015 19:30:44 -0500 Date: Sun, 11 Jan 2015 16:30:39 -0800 From: Dmitry Torokhov To: Pali =?iso-8859-1?Q?Roh=E1r?= Cc: Hans de Goede , Yunkang Tang , Vadim Klishko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 5/7] input: alps: Fix name, product and version of dev2 input device Message-ID: <20150112003039.GB31862@dtor-ws> References: <1415993906-13307-1-git-send-email-pali.rohar@gmail.com> <1415993906-13307-6-git-send-email-pali.rohar@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1415993906-13307-6-git-send-email-pali.rohar@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Nov 14, 2014 at 08:38:24PM +0100, Pali Rohár wrote: > This patch fix name, product and version of dev2 input device based on format > used in function psmouse_switch_protocol() in file psmouse-base.c. > > Signed-off-by: Pali Rohár Applied, thank you. > --- > drivers/input/mouse/alps.c | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c > index 0176425..2b7b74d 100644 > --- a/drivers/input/mouse/alps.c > +++ b/drivers/input/mouse/alps.c > @@ -2407,14 +2407,24 @@ int alps_init(struct psmouse *psmouse) > dev1->keybit[BIT_WORD(BTN_MIDDLE)] |= BIT_MASK(BTN_MIDDLE); > } > > + if (priv->flags & ALPS_DUALPOINT) { > + /* > + * format of input device name is: "protocol vendor name" > + * see function psmouse_switch_protocol() in psmouse-base.c > + */ > + dev2->name = "AlpsPS/2 ALPS DualPoint Stick"; > + dev2->id.product = PSMOUSE_ALPS; > + dev2->id.version = priv->proto_version; > + } else { > + dev2->name = "PS/2 ALPS Mouse"; > + dev2->id.product = PSMOUSE_PS2; > + dev2->id.version = 0x0000; > + } > + > snprintf(priv->phys, sizeof(priv->phys), "%s/input1", psmouse->ps2dev.serio->phys); > dev2->phys = priv->phys; > - dev2->name = (priv->flags & ALPS_DUALPOINT) ? > - "DualPoint Stick" : "ALPS PS/2 Device"; > dev2->id.bustype = BUS_I8042; > dev2->id.vendor = 0x0002; > - dev2->id.product = PSMOUSE_ALPS; > - dev2->id.version = 0x0000; > dev2->dev.parent = &psmouse->ps2dev.serio->dev; > > dev2->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL); > -- > 1.7.9.5 > -- Dmitry