summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-21 09:30:27 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-18 23:15:31 +0000
commit945f6310d3cf0523560b33b9ddb3271666141bd5 (patch)
tree218cdca0f2854adc17d9e50efc0f9c3154954339
parentabe06082d07fcb0673cb93338c1d6f037fdc375b (diff)
downloadop-kernel-dev-945f6310d3cf0523560b33b9ddb3271666141bd5.zip
op-kernel-dev-945f6310d3cf0523560b33b9ddb3271666141bd5.tar.gz
MFD: ucb1x00-ts: provide input layer with device parent
Provide the input layer struct device with its parent device, so that the input layer's device appears in the correct place in the device tree. This also allows the input device to be visibily associated with its hardware. Acked-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/mfd/ucb1x00-ts.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c
index ec6ffb6..742d0c7 100644
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
@@ -363,6 +363,7 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev)
idev->id.product = ts->ucb->id;
idev->open = ucb1x00_ts_open;
idev->close = ucb1x00_ts_close;
+ idev->dev.parent = &ts->ucb->dev;
idev->evbit[0] = BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY);
idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
OpenPOWER on IntegriCloud