projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0e1763f)
Input: ALPS - put secondary device in proper place in sysfs
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 18 Mar 2008 04:29:18 +0000 (00:29 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 18 Mar 2008 04:29:18 +0000 (00:29 -0400)
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 patch | blob | blame | history

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index b346a3b418ea78d60d4a129b911d7fe7a37035cb..6e8da5eecb89fbd1ca553cdea65d080b657d0fa5 100644 (file)
--- 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);