diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
| commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
| tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /drivers/input/evdev.c | |
| parent | 3f07d8796262f6aee135c8dd9a91210da9f888e4 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
| download | op-kernel-dev-334d0dd8b660557608142f0f77abc6812b48f08b.zip op-kernel-dev-334d0dd8b660557608142f0f77abc6812b48f08b.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 0b45d47..a4c3729 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -664,7 +664,7 @@ static int evdev_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, evdev->name); if (error) goto err_cdev_destroy; @@ -676,7 +676,7 @@ static int evdev_connect(struct input_handler *handler, struct input_dev *dev, return 0; err_remove_link: - sysfs_remove_link(&input_class.subsys.kset.kobj, evdev->name); + sysfs_remove_link(&input_class.subsys.kobj, evdev->name); err_cdev_destroy: class_device_destroy(&input_class, devt); err_free_evdev: @@ -692,7 +692,7 @@ static void evdev_disconnect(struct input_handle *handle) input_unregister_handle(handle); - sysfs_remove_link(&input_class.subsys.kset.kobj, evdev->name); + sysfs_remove_link(&input_class.subsys.kobj, evdev->name); class_device_destroy(&input_class, MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor)); evdev->exist = 0; |
