Commit 1c34203a authored Jan 28, 2015 by Junjie Mao Committed by Greg Kroah-Hartman Mar 25, 2015

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: fa6fdb33 ("driver core: bus_type: add dev_groups")
Signed-off-by: Junjie Mao <junjie_mao@yeah.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent bb2b4075

drivers/base/bus.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)

Admin message