hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Input: psmouse - use same format for secondary devices as for primary 

This patch changes name of secondary psmouse devices to mach format of
primary device. Format of primary device is "protocol vendor name" and is
set by function psmouse_switch_protocol() in file psmouse-base.c.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Pali Rohár 2016-06-18 10:09:43 -07:00 committed by Dmitry Torokhov
parent 1afca2b66a
commit 9096a45d99
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/mouse/elantech.c
View File

@ -1714,7 +1714,7 @@ int elantech_init(struct psmouse *psmouse)
snprintf(etd->tp_phys, sizeof(etd->tp_phys), "%s/input1", snprintf(etd->tp_phys, sizeof(etd->tp_phys), "%s/input1",
psmouse->ps2dev.serio->phys); psmouse->ps2dev.serio->phys);
tp_dev->phys = etd->tp_phys; tp_dev->phys = etd->tp_phys;
tp_dev->name = "Elantech PS/2 TrackPoint"; tp_dev->name = "ETPS/2 Elantech TrackPoint";
tp_dev->id.bustype = BUS_I8042; tp_dev->id.bustype = BUS_I8042;
tp_dev->id.vendor = 0x0002; tp_dev->id.vendor = 0x0002;
tp_dev->id.product = PSMOUSE_ELANTECH; tp_dev->id.product = PSMOUSE_ELANTECH;

2
drivers/input/mouse/lifebook.c
View File

@ -287,7 +287,7 @@ static int lifebook_create_relative_device(struct psmouse *psmouse)
"%s/input1", psmouse->ps2dev.serio->phys); "%s/input1", psmouse->ps2dev.serio->phys);
dev2->phys = priv->phys; dev2->phys = priv->phys;
dev2->name = "PS/2 Touchpad"; dev2->name = "LBPS/2 Fujitsu Lifebook Touchpad";
dev2->id.bustype = BUS_I8042; dev2->id.bustype = BUS_I8042;
dev2->id.vendor = 0x0002; dev2->id.vendor = 0x0002;
dev2->id.product = PSMOUSE_LIFEBOOK; dev2->id.product = PSMOUSE_LIFEBOOK;