4 files changed, 32 insertions, 8 deletions

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 2a96b260a2a8..a4696cd0978c 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -661,6 +661,7 @@ static struct file_operations evdev_fops = {
 static struct input_handle *evdev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)
 {
         struct evdev *evdev;
+        struct class_device *cdev;
         int minor;
 
         for (minor = 0; minor < EVDEV_MINORS && evdev_table[minor]; minor++);
@@ -686,9 +687,13 @@ static struct input_handle *evdev_connect(struct input_handler *handler, struct
 
         evdev_table[minor] = evdev;
 
-        class_device_create(&input_class, &dev->cdev,
+        cdev = class_device_create(&input_class, &dev->cdev,
                         MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor),
-                        dev->cdev.dev, "event%d", minor);
+                        dev->cdev.dev, evdev->name);
+
+        /* temporary symlink to keep userspace happy */
+        sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,
+                          evdev->name);
 
         return &evdev->handle;
 }
@@ -698,6 +703,7 @@ static void evdev_disconnect(struct input_handle *handle)
         struct evdev *evdev = handle->private;
         struct evdev_list *list;
 
+        sysfs_remove_link(&input_class.subsys.kset.kobj, evdev->name);
         class_device_destroy(&input_class,
                         MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor));
         evdev->exist = 0;
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;
 
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 = {
 static struct input_handle *mousedev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)
 {
         struct mousedev *mousedev;
+        struct class_device *cdev;
         int minor = 0;
 
         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
 
         mousedev_table[minor] = mousedev;
 
-        class_device_create(&input_class, &dev->cdev,
+        cdev = class_device_create(&input_class, &dev->cdev,
                         MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor),
-                        dev->cdev.dev, "mouse%d", minor);
+                        dev->cdev.dev, mousedev->name);
+
+        /* temporary symlink to keep userspace happy */
+        sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,
+                          mousedev->name);
 
         return &mousedev->handle;
 }
@@ -660,6 +665,7 @@ static void mousedev_disconnect(struct input_handle *handle)
         struct mousedev *mousedev = handle->private;
         struct mousedev_list *list;
 
+        sysfs_remove_link(&input_class.subsys.kset.kobj, mousedev->name);
         class_device_destroy(&input_class,
                         MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor));
         mousedev->exist = 0;
diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index 75e165736655..ca1547929d62 100644
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -368,6 +368,7 @@ static struct input_handle *tsdev_connect(struct input_handler *handler,
                                           struct input_device_id *id)
 {
         struct tsdev *tsdev;
+        struct class_device *cdev;
         int minor, delta;
 
         for (minor = 0; minor < TSDEV_MINORS/2 && tsdev_table[minor];
@@ -409,9 +410,13 @@ static struct input_handle *tsdev_connect(struct input_handler *handler,
 
         tsdev_table[minor] = tsdev;
 
-        class_device_create(&input_class, &dev->cdev,
+        cdev = class_device_create(&input_class, &dev->cdev,
                         MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor),
-                        dev->cdev.dev, "ts%d", minor);
+                        dev->cdev.dev, tsdev->name);
+
+        /* temporary symlink to keep userspace happy */
+        sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,
+                          tsdev->name);
 
         return &tsdev->handle;
 }
@@ -421,6 +426,7 @@ static void tsdev_disconnect(struct input_handle *handle)
         struct tsdev *tsdev = handle->private;
         struct tsdev_list *list;
 
+        sysfs_remove_link(&input_class.subsys.kset.kobj, tsdev->name);
         class_device_destroy(&input_class,
                         MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor));
         tsdev->exist = 0;