---

yaml --- r: 72927 b: refs/heads/master c: 60b8cab h: refs/heads/master i: 72925: 49e248c 72923: 2c049e9 72919: 5b366a7 72911: 4197d55 72895: dd86fe6 v: v3
git-mirror · Oct 31, 2007 · e8bb5b3 · e8bb5b3
1 parent a209afc
commit e8bb5b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78e9d3678c8362aad2b2a48c242966aebb089dbd
+refs/heads/master: 60b8cabd8e8a1d266aa8778957691cd925673083
diff --git a/trunk/drivers/base/core.c b/trunk/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);
 		}
 	}
-#endif
-
+#else
 	if (dev->class) {
 		sysfs_remove_link(&dev->class->subsys.kobj, old_device_name);
 		error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
 					  dev->bus_id);
 		if (error) {
-			/* Uh... how to unravel this if restoring can fail? */
 			dev_err(dev, "%s: sysfs_create_symlink failed (%d)\n",
 				__FUNCTION__, error);
 		}
 	}
+#endif
+
 out:
 	put_device(dev);