commit 1db3a3453f6915d6af322e3a1b25f7ab2c9d9a2b
author Dmitry Torokhov <dmitry.torokhov@gmail.com> Tue Mar 18 00:29:18 2008 -0400
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> Tue Mar 18 00:29:18 2008 -0400
tree cd794284b59c87ffd25754a701b21671a9c68a5a
parent 0e1763f530af71bd82e58e407991a9ded6aae73e

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>

drivers/input/mouse/alps.c

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 @@
 	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);