summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2008-03-18 00:29:18 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-03-18 00:29:18 -0400
commit1db3a3453f6915d6af322e3a1b25f7ab2c9d9a2b (patch)
treecd794284b59c87ffd25754a701b21671a9c68a5a /drivers/input
parent0e1763f530af71bd82e58e407991a9ded6aae73e (diff)
downloadop-kernel-dev-1db3a3453f6915d6af322e3a1b25f7ab2c9d9a2b.zip
op-kernel-dev-1db3a3453f6915d6af322e3a1b25f7ab2c9d9a2b.tar.gz
Input: ALPS - put secondary device in proper place in sysfs
Secondary input device did not have parent set up causing it to appear in the root of sysfs device hierarchy. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/alps.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index b346a3b..6e8da5e 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -483,6 +483,7 @@ int alps_init(struct psmouse *psmouse)
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);
dev2->relbit[BIT_WORD(REL_X)] |= BIT_MASK(REL_X) | BIT_MASK(REL_Y);
OpenPOWER on IntegriCloud