summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-03-16 22:09:25 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-03-16 23:28:30 -0700
commitb4b480a8d643cbdef6f925e55759c18a674fa454 (patch)
tree3eb9b8b905bd128e6b90c2cf5bea2500ee333381 /drivers/input
parent2721a89ac41f2e7705484c1582c293c4eee5344d (diff)
downloadlinux-stable-b4b480a8d643cbdef6f925e55759c18a674fa454.tar.gz
linux-stable-b4b480a8d643cbdef6f925e55759c18a674fa454.tar.bz2
linux-stable-b4b480a8d643cbdef6f925e55759c18a674fa454.zip
Input: tsc2005 - set up parent device
Set up SPI device as parent of the input device so it gets placed into proper place in sysfs tree. Tested-by: Aaro Koskinen <aaro.koskinen@nokia.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/tsc2005.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index 732c81e9a3e6..e294648a97c9 100644
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -555,6 +555,7 @@ static int __devinit tsc2005_setup(struct tsc2005 *ts,
snprintf(ts->phys, sizeof(ts->phys), "%s/input-ts",
dev_name(&ts->spi->dev));
ts->idev->phys = ts->phys;
+ ts->idev->dev.parent = &ts->spi->dev;
ts->idev->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY);
ts->idev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE);
ts->idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);