Commit:     60b8cabd8e8a1d266aa8778957691cd925673083
Parent:     78e9d3678c8362aad2b2a48c242966aebb089dbd
Author:     Kay Sievers <[EMAIL PROTECTED]>
AuthorDate: Fri Oct 26 20:07:44 2007 +0200
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Tue Oct 30 21:52:33 2007 -0700

    Driver Core: fix bug in device_rename() for SYSFS_DEPRECATED=y
    This should fix the sysfs warnings that renaming network devices is
    causing to show up with CONFIG_SYSFS_DEPRECATED=y
    The code just shouldn't run if class devices are real directories, it's
    an update for the symlink in the class directory. Nobody noticed that as
    long as the creation of sysfs files silently failed, and we both missed
    it before the merge, because we don't run SYSFS_DEPRECATED=y.
    Signed-off-by: Kay Sievers <[EMAIL PROTECTED]>
    Cc: Larry Finger <[EMAIL PROTECTED]>
    Cc: David Miller <[EMAIL PROTECTED]>
    Cc: Rafael J. Wysocki <[EMAIL PROTECTED]>
    Cc: Tejun Heo <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
 drivers/base/core.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index c134341..3f4d6aa 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1228,18 +1228,18 @@ int device_rename(struct device *dev, char *new_name)
                        sysfs_remove_link(&dev->parent->kobj, old_class_name);
        if (dev->class) {
                sysfs_remove_link(&dev->class->subsys.kobj, old_device_name);
                error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
                if (error) {
-                       /* Uh... how to unravel this if restoring can fail? */
                        dev_err(dev, "%s: sysfs_create_symlink failed (%d)\n",
                                __FUNCTION__, error);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to