aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2007-07-25 03:58:08 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-07-30 17:25:12 -0400
commit27907689eedd799a6a0c1a2f18a3563c6e9e9767 (patch)
tree0fbf51e85b0c591a6c866413892f8df2160c66f7
parenta2765e81d8a58f66e21176ca2a8fd6012b187994 (diff)
driver core: revert "device" link creation check
driver core: revert "device" link creation check Commit 2ee97caf0a6602f749ddbfdb1449e383e1212707 introduced an extra check on when to create the "device" symlink. Unfortunately, this breaks input, so let's revert to the old behaviour. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Acked-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/base/core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index b9bb3995db84..e6738bcbe5a9 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -678,8 +678,7 @@ static int device_add_class_symlinks(struct device *dev)
678 if (error) 678 if (error)
679 goto out_subsys; 679 goto out_subsys;
680 } 680 }
681 /* only bus-device parents get a "device"-link */ 681 if (dev->parent) {
682 if (dev->parent && dev->parent->bus) {
683 error = sysfs_create_link(&dev->kobj, &dev->parent->kobj, 682 error = sysfs_create_link(&dev->kobj, &dev->parent->kobj,
684 "device"); 683 "device");
685 if (error) 684 if (error)