aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joydev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/joydev.c')
-rw-r--r--drivers/input/joydev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 816a585a0e6b..ff8e1bbd0e13 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -518,9 +518,9 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct
518 518
519 devfs_mk_cdev(MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor), 519 devfs_mk_cdev(MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
520 S_IFCHR|S_IRUGO|S_IWUSR, "input/js%d", minor); 520 S_IFCHR|S_IRUGO|S_IWUSR, "input/js%d", minor);
521 class_simple_device_add(input_class, 521 class_device_create(input_class,
522 MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor), 522 MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
523 dev->dev, "js%d", minor); 523 dev->dev, "js%d", minor);
524 524
525 return &joydev->handle; 525 return &joydev->handle;
526} 526}
@@ -530,7 +530,7 @@ static void joydev_disconnect(struct input_handle *handle)
530 struct joydev *joydev = handle->private; 530 struct joydev *joydev = handle->private;
531 struct joydev_list *list; 531 struct joydev_list *list;
532 532
533 class_simple_device_remove(MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor)); 533 class_device_destroy(input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
534 devfs_remove("input/js%d", joydev->minor); 534 devfs_remove("input/js%d", joydev->minor);
535 joydev->exist = 0; 535 joydev->exist = 0;
536 536