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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 4f37224d2268..9bcc5425049b 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -560,7 +560,7 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
560 } 560 }
561 561
562 /* temporary symlink to keep userspace happy */ 562 /* temporary symlink to keep userspace happy */
563 error = sysfs_create_link(&input_class.subsys.kset.kobj, 563 error = sysfs_create_link(&input_class.subsys.kobj,
564 &cdev->kobj, joydev->name); 564 &cdev->kobj, joydev->name);
565 if (error) 565 if (error)
566 goto err_cdev_destroy; 566 goto err_cdev_destroy;
@@ -572,7 +572,7 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
572 return 0; 572 return 0;
573 573
574 err_remove_link: 574 err_remove_link:
575 sysfs_remove_link(&input_class.subsys.kset.kobj, joydev->name); 575 sysfs_remove_link(&input_class.subsys.kobj, joydev->name);
576 err_cdev_destroy: 576 err_cdev_destroy:
577 class_device_destroy(&input_class, devt); 577 class_device_destroy(&input_class, devt);
578 err_free_joydev: 578 err_free_joydev:
@@ -589,7 +589,7 @@ static void joydev_disconnect(struct input_handle *handle)
589 589
590 input_unregister_handle(handle); 590 input_unregister_handle(handle);
591 591
592 sysfs_remove_link(&input_class.subsys.kset.kobj, joydev->name); 592 sysfs_remove_link(&input_class.subsys.kobj, joydev->name);
593 class_device_destroy(&input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor)); 593 class_device_destroy(&input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
594 joydev->exist = 0; 594 joydev->exist = 0;
595 595