Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index 8e2d2c924adf..5e5b5c91d75b 100644
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -442,7 +442,7 @@ static int tsdev_connect(struct input_handler *handler, struct input_dev *dev,
         }
 
         /* temporary symlink to keep userspace happy */
-        error = sysfs_create_link(&input_class.subsys.kset.kobj,
+        error = sysfs_create_link(&input_class.subsys.kobj,
                                   &cdev->kobj, tsdev->name);
         if (error)
                 goto err_cdev_destroy;
@@ -454,7 +454,7 @@ static int tsdev_connect(struct input_handler *handler, struct input_dev *dev,
         return 0;
 
  err_remove_link:
-        sysfs_remove_link(&input_class.subsys.kset.kobj, tsdev->name);
+        sysfs_remove_link(&input_class.subsys.kobj, tsdev->name);
  err_cdev_destroy:
         class_device_destroy(&input_class, devt);
  err_free_tsdev:
@@ -470,7 +470,7 @@ static void tsdev_disconnect(struct input_handle *handle)
 
         input_unregister_handle(handle);
 
-        sysfs_remove_link(&input_class.subsys.kset.kobj, tsdev->name);
+        sysfs_remove_link(&input_class.subsys.kobj, tsdev->name);
         class_device_destroy(&input_class,
                         MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor));
         tsdev->exist = 0;