[PATCH] INPUT: Create symlinks for backwards compatibility

This creates symlinks in /sys/class/input/ to the nested class devices
to help userspace cope with the nesting.

Unfortunatly udev still needs to be updated as it can't handle symlinks
properly here :(

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 25f7eba4761f..20e2972b9204 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -448,6 +448,7 @@ static struct file_operations joydev_fops = {
 static struct input_handle *joydev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)
 {
         struct joydev *joydev;
+        struct class_device *cdev;
         int i, j, t, minor;
 
         for (minor = 0; minor < JOYDEV_MINORS && joydev_table[minor]; minor++);
@@ -513,9 +514,13 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct
 
         joydev_table[minor] = joydev;
 
-        class_device_create(&input_class, &dev->cdev,
+        cdev = class_device_create(&input_class, &dev->cdev,
                         MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
-                        dev->cdev.dev, "js%d", minor);
+                        dev->cdev.dev, joydev->name);
+
+        /* temporary symlink to keep userspace happy */
+        sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,
+                          joydev->name);
 
         return &joydev->handle;
 }
@@ -525,6 +530,7 @@ static void joydev_disconnect(struct input_handle *handle)
         struct joydev *joydev = handle->private;
         struct joydev_list *list;
 
+        sysfs_remove_link(&input_class.subsys.kset.kobj, joydev->name);
         class_device_destroy(&input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
         joydev->exist = 0;