diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | 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 c1343414d285..3f4d6aa13990 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -1228,18 +1228,18 @@ int device_rename(struct device *dev, char *new_name) | |||
1228 | sysfs_remove_link(&dev->parent->kobj, old_class_name); | 1228 | sysfs_remove_link(&dev->parent->kobj, old_class_name); |
1229 | } | 1229 | } |
1230 | } | 1230 | } |
1231 | #endif | 1231 | #else |
1232 | |||
1233 | if (dev->class) { | 1232 | if (dev->class) { |
1234 | sysfs_remove_link(&dev->class->subsys.kobj, old_device_name); | 1233 | sysfs_remove_link(&dev->class->subsys.kobj, old_device_name); |
1235 | error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj, | 1234 | error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj, |
1236 | dev->bus_id); | 1235 | dev->bus_id); |
1237 | if (error) { | 1236 | if (error) { |
1238 | /* Uh... how to unravel this if restoring can fail? */ | ||
1239 | dev_err(dev, "%s: sysfs_create_symlink failed (%d)\n", | 1237 | dev_err(dev, "%s: sysfs_create_symlink failed (%d)\n", |
1240 | __FUNCTION__, error); | 1238 | __FUNCTION__, error); |
1241 | } | 1239 | } |
1242 | } | 1240 | } |
1241 | #endif | ||
1242 | |||
1243 | out: | 1243 | out: |
1244 | put_device(dev); | 1244 | put_device(dev); |
1245 | 1245 | ||