X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fbase%2Fcore.c;h=3f4d6aa139909e49ac77541bdd8b94f46979dae2;hb=60b8cabd8e8a1d266aa8778957691cd925673083;hp=c1343414d285e29f57fe17e089e635be20af3aed;hpb=78e9d3678c8362aad2b2a48c242966aebb089dbd;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/base/core.c b/drivers/base/core.c
index c1343414d28..3f4d6aa1399 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);
 		}
 	}
-#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);