diff options
Diffstat (limited to 'drivers/input/touchscreen/elo.c')
-rw-r--r-- | drivers/input/touchscreen/elo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c index 9d61cd133d01..557d781719f1 100644 --- a/drivers/input/touchscreen/elo.c +++ b/drivers/input/touchscreen/elo.c | |||
@@ -312,14 +312,13 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv) | |||
312 | init_completion(&elo->cmd_done); | 312 | init_completion(&elo->cmd_done); |
313 | snprintf(elo->phys, sizeof(elo->phys), "%s/input0", serio->phys); | 313 | snprintf(elo->phys, sizeof(elo->phys), "%s/input0", serio->phys); |
314 | 314 | ||
315 | input_dev->private = elo; | ||
316 | input_dev->name = "Elo Serial TouchScreen"; | 315 | input_dev->name = "Elo Serial TouchScreen"; |
317 | input_dev->phys = elo->phys; | 316 | input_dev->phys = elo->phys; |
318 | input_dev->id.bustype = BUS_RS232; | 317 | input_dev->id.bustype = BUS_RS232; |
319 | input_dev->id.vendor = SERIO_ELO; | 318 | input_dev->id.vendor = SERIO_ELO; |
320 | input_dev->id.product = elo->id; | 319 | input_dev->id.product = elo->id; |
321 | input_dev->id.version = 0x0100; | 320 | input_dev->id.version = 0x0100; |
322 | input_dev->cdev.dev = &serio->dev; | 321 | input_dev->dev.parent = &serio->dev; |
323 | 322 | ||
324 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); | 323 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); |
325 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); | 324 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); |