diff options
Diffstat (limited to 'drivers/input/evdev.c')
-rw-r--r-- | drivers/input/evdev.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index d62c73f5ba93..374f404e81da 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
@@ -678,9 +678,9 @@ static struct input_handle *evdev_connect(struct input_handler *handler, struct | |||
678 | 678 | ||
679 | devfs_mk_cdev(MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor), | 679 | devfs_mk_cdev(MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor), |
680 | S_IFCHR|S_IRUGO|S_IWUSR, "input/event%d", minor); | 680 | S_IFCHR|S_IRUGO|S_IWUSR, "input/event%d", minor); |
681 | class_simple_device_add(input_class, | 681 | class_device_create(input_class, |
682 | MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor), | 682 | MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor), |
683 | dev->dev, "event%d", minor); | 683 | dev->dev, "event%d", minor); |
684 | 684 | ||
685 | return &evdev->handle; | 685 | return &evdev->handle; |
686 | } | 686 | } |
@@ -690,7 +690,8 @@ static void evdev_disconnect(struct input_handle *handle) | |||
690 | struct evdev *evdev = handle->private; | 690 | struct evdev *evdev = handle->private; |
691 | struct evdev_list *list; | 691 | struct evdev_list *list; |
692 | 692 | ||
693 | class_simple_device_remove(MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor)); | 693 | class_device_destroy(input_class, |
694 | MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor)); | ||
694 | devfs_remove("input/event%d", evdev->minor); | 695 | devfs_remove("input/event%d", evdev->minor); |
695 | evdev->exist = 0; | 696 | evdev->exist = 0; |
696 | 697 | ||