The patch titled
driver-core-check-return-code-of-sysfs_create_link fix
has been added to the -mm tree. Its filename is
driver-core-check-return-code-of-sysfs_create_link-fix.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: driver-core-check-return-code-of-sysfs_create_link fix
From: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Fix check when to create certain symlinks (the device link and some
compatible links).
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/base/core.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff -puN drivers/base/core.c~driver-core-check-return-code-of-sysfs_create_link-fix drivers/base/core.c
--- a/drivers/base/core.c~driver-core-check-return-code-of-sysfs_create_link-fix
+++ a/drivers/base/core.c
@@ -657,12 +657,12 @@ static int device_add_class_symlinks(str
* If this is not a "fake" compatible device, then create the
* symlink from the class to the device.
*/
- if (dev->kobj.parent == &dev->class->subsys.kobj)
- return 0;
- error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
- dev->bus_id);
- if (error)
- goto out_subsys;
+ if (dev->kobj.parent != &dev->class->subsys.kobj) {
+ error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
+ dev->bus_id);
+ if (error)
+ goto out_subsys;
+ }
if (dev->parent) {
error = sysfs_create_link(&dev->kobj, &dev->parent->kobj,
"device");
@@ -689,7 +689,8 @@ out_device:
sysfs_remove_link(&dev->kobj, "device");
#endif
out_busid:
- sysfs_remove_link(&dev->class->subsys.kobj, dev->bus_id);
+ if (dev->kobj.parent != &dev->class->subsys.kobj)
+ sysfs_remove_link(&dev->class->subsys.kobj, dev->bus_id);
out_subsys:
sysfs_remove_link(&dev->kobj, "subsystem");
out:
@@ -712,7 +713,8 @@ static void device_remove_class_symlinks
#endif
sysfs_remove_link(&dev->kobj, "device");
}
- sysfs_remove_link(&dev->class->subsys.kobj, dev->bus_id);
+ if (dev->kobj.parent != &dev->class->subsys.kobj)
+ sysfs_remove_link(&dev->class->subsys.kobj, dev->bus_id);
sysfs_remove_link(&dev->kobj, "subsystem");
}
_
Patches currently in -mm which might be from cornelia.huck@xxxxxxxxxx are
driver-core-check-return-code-of-sysfs_create_link.patch
driver-core-check-return-code-of-sysfs_create_link-fix.patch
driver-core-coding-style-cleanup.patch
partitions-check-the-return-value-of-kobject_add-etc.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
