From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 18 Mar 2008 04:29:18 +0000 (-0400)
Subject: Input: ALPS - put secondary device in proper place in sysfs
X-Git-Tag: Ubuntu-5.10.0-12.13~40675^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1db3a3453f6915d6af322e3a1b25f7ab2c9d9a2b;p=mirror_ubuntu-hirsute-kernel.git

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>
---

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index b346a3b418ea..6e8da5eecb89 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);