| Message ID | 1415993906-13307-6-git-send-email-pali.rohar@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <pali.rohar@gmail.com> 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 >
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);
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 <pali.rohar@gmail.com> --- drivers/input/mouse/alps.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)