diff options
Diffstat (limited to 'drivers/input/mousedev.c')
-rw-r--r-- | drivers/input/mousedev.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index de2808fc85b3..2d0af44ac4b9 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c | |||
@@ -620,6 +620,7 @@ static struct file_operations mousedev_fops = { | |||
620 | static struct input_handle *mousedev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id) | 620 | static struct input_handle *mousedev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id) |
621 | { | 621 | { |
622 | struct mousedev *mousedev; | 622 | struct mousedev *mousedev; |
623 | struct class_device *cdev; | ||
623 | int minor = 0; | 624 | int minor = 0; |
624 | 625 | ||
625 | for (minor = 0; minor < MOUSEDEV_MINORS && mousedev_table[minor]; minor++); | 626 | for (minor = 0; minor < MOUSEDEV_MINORS && mousedev_table[minor]; minor++); |
@@ -648,9 +649,13 @@ static struct input_handle *mousedev_connect(struct input_handler *handler, stru | |||
648 | 649 | ||
649 | mousedev_table[minor] = mousedev; | 650 | mousedev_table[minor] = mousedev; |
650 | 651 | ||
651 | class_device_create(&input_class, &dev->cdev, | 652 | cdev = class_device_create(&input_class, &dev->cdev, |
652 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor), | 653 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor), |
653 | dev->cdev.dev, "mouse%d", minor); | 654 | dev->cdev.dev, mousedev->name); |
655 | |||
656 | /* temporary symlink to keep userspace happy */ | ||
657 | sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj, | ||
658 | mousedev->name); | ||
654 | 659 | ||
655 | return &mousedev->handle; | 660 | return &mousedev->handle; |
656 | } | 661 | } |
@@ -660,6 +665,7 @@ static void mousedev_disconnect(struct input_handle *handle) | |||
660 | struct mousedev *mousedev = handle->private; | 665 | struct mousedev *mousedev = handle->private; |
661 | struct mousedev_list *list; | 666 | struct mousedev_list *list; |
662 | 667 | ||
668 | sysfs_remove_link(&input_class.subsys.kset.kobj, mousedev->name); | ||
663 | class_device_destroy(&input_class, | 669 | class_device_destroy(&input_class, |
664 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor)); | 670 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor)); |
665 | mousedev->exist = 0; | 671 | mousedev->exist = 0; |