diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/base/core.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index be288b5e4180..3eeac5a78581 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -1218,13 +1218,11 @@ int device_rename(struct device *dev, char *new_name) | |||
1218 | } | 1218 | } |
1219 | #else | 1219 | #else |
1220 | if (dev->class) { | 1220 | if (dev->class) { |
1221 | sysfs_remove_link(&dev->class->subsys.kobj, old_device_name); | ||
1222 | error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj, | 1221 | error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj, |
1223 | dev->bus_id); | 1222 | dev->bus_id); |
1224 | if (error) { | 1223 | if (error) |
1225 | dev_err(dev, "%s: sysfs_create_symlink failed (%d)\n", | 1224 | goto out; |
1226 | __func__, error); | 1225 | sysfs_remove_link(&dev->class->subsys.kobj, old_device_name); |
1227 | } | ||
1228 | } | 1226 | } |
1229 | #endif | 1227 | #endif |
1230 | 1228 | ||