|
@@ -1228,18 +1228,18 @@ int device_rename(struct device *dev, char *new_name)
|
|
|
sysfs_remove_link(&dev->parent->kobj, old_class_name);
|
|
sysfs_remove_link(&dev->parent->kobj, old_class_name);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-#endif
|
|
|
|
|
-
|
|
|
|
|
|
|
+#else
|
|
|
if (dev->class) {
|
|
if (dev->class) {
|
|
|
sysfs_remove_link(&dev->class->subsys.kobj, old_device_name);
|
|
sysfs_remove_link(&dev->class->subsys.kobj, old_device_name);
|
|
|
error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
|
|
error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
|
|
|
dev->bus_id);
|
|
dev->bus_id);
|
|
|
if (error) {
|
|
if (error) {
|
|
|
- /* Uh... how to unravel this if restoring can fail? */
|
|
|
|
|
dev_err(dev, "%s: sysfs_create_symlink failed (%d)\n",
|
|
dev_err(dev, "%s: sysfs_create_symlink failed (%d)\n",
|
|
|
__FUNCTION__, error);
|
|
__FUNCTION__, error);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
out:
|
|
out:
|
|
|
put_device(dev);
|
|
put_device(dev);
|
|
|
|
|
|