driver core: bus: Goto appropriate labels on failure in bus_add_device

It is not necessary to call device_remove_groups() when device_add_groups() fails. The group added by device_add_groups() should be removed if sysfs_create_link() fails. Fixes: fa6fdb3 ("driver core: bus_type: add dev_groups") Signed-off-by: Junjie Mao <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
ambv · Mar 25, 2015 · 1c34203 · 1c34203
1 parent bb2b407
commit 1c34203
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
@@ -515,11 +515,11 @@ int bus_add_device(struct device *dev)
 			goto out_put;
 		error = device_add_groups(dev, bus->dev_groups);
 		if (error)
-			goto out_groups;
+			goto out_id;
 		error = sysfs_create_link(&bus->p->devices_kset->kobj,
 						&dev->kobj, dev_name(dev));
 		if (error)
-			goto out_id;
+			goto out_groups;
 		error = sysfs_create_link(&dev->kobj,
 				&dev->bus->p->subsys.kobj, "subsystem");
 		if (error)