Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[pandora-kernel.git] / drivers / input / touchscreen / touchright.c

diff --git a/drivers/input/touchscreen/touchright.c b/drivers/input/touchscreen/touchright.c
index 35ba46c..3def7bb 100644 (file)
--- a/drivers/input/touchscreen/touchright.c
+++ b/drivers/input/touchscreen/touchright.c
@@ -118,13 +118,13 @@ static int tr_connect(struct serio *serio, struct serio_driver *drv)
        tr->dev = input_dev;
        snprintf(tr->phys, sizeof(tr->phys), "%s/input0", serio->phys);
 
-       input_dev->private = tr;
        input_dev->name = "Touchright Serial TouchScreen";
        input_dev->phys = tr->phys;
        input_dev->id.bustype = BUS_RS232;
        input_dev->id.vendor = SERIO_TOUCHRIGHT;
        input_dev->id.product = 0;
        input_dev->id.version = 0x0100;
+       input_dev->dev.parent = &serio->dev;
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
        input_set_abs_params(tr->dev, ABS_X, TR_MIN_XC, TR_MAX_XC, 0, 0);