diff options
Diffstat (limited to 'drivers/input/keyboard/lkkbd.c')
-rw-r--r-- | drivers/input/keyboard/lkkbd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c index 3d4d0a0ede28..1b08f4e79dd2 100644 --- a/drivers/input/keyboard/lkkbd.c +++ b/drivers/input/keyboard/lkkbd.c | |||
@@ -515,7 +515,7 @@ static int | |||
515 | lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code, | 515 | lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code, |
516 | int value) | 516 | int value) |
517 | { | 517 | { |
518 | struct lkkbd *lk = dev->private; | 518 | struct lkkbd *lk = input_get_drvdata (dev); |
519 | unsigned char leds_on = 0; | 519 | unsigned char leds_on = 0; |
520 | unsigned char leds_off = 0; | 520 | unsigned char leds_off = 0; |
521 | 521 | ||
@@ -666,9 +666,10 @@ lkkbd_connect (struct serio *serio, struct serio_driver *drv) | |||
666 | input_dev->id.vendor = SERIO_LKKBD; | 666 | input_dev->id.vendor = SERIO_LKKBD; |
667 | input_dev->id.product = 0; | 667 | input_dev->id.product = 0; |
668 | input_dev->id.version = 0x0100; | 668 | input_dev->id.version = 0x0100; |
669 | input_dev->cdev.dev = &serio->dev; | 669 | input_dev->dev.parent = &serio->dev; |
670 | input_dev->event = lkkbd_event; | 670 | input_dev->event = lkkbd_event; |
671 | input_dev->private = lk; | 671 | |
672 | input_set_drvdata (input_dev, lk); | ||
672 | 673 | ||
673 | set_bit (EV_KEY, input_dev->evbit); | 674 | set_bit (EV_KEY, input_dev->evbit); |
674 | set_bit (EV_LED, input_dev->evbit); | 675 | set_bit (EV_LED, input_dev->evbit); |