From: Russell King Date: Sat, 21 Jan 2012 09:30:27 +0000 (+0000) Subject: MFD: ucb1x00-ts: provide input layer with device parent X-Git-Tag: v3.4-rc1~83^2^3~4^2~17 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=945f6310d3cf0523560b33b9ddb3271666141bd5;p=karo-tx-linux.git 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 Signed-off-by: Russell King --- diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c index ec6ffb6e287d..742d0c7bbbc2 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);