| From | Greg Kroah-Hartman <> | Subject | [PATCH 3.14 91/92] driver core: bus: Goto appropriate labels on failure in bus_add_device | Date | Sat, 2 May 2015 21:03:46 +0200 |
| |
3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junjie Mao <junjie_mao@yeah.net>
commit 1c34203a1496d1849ba978021b878b3447d433c8 upstream.
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: fa6fdb33b486 ("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>
--- drivers/base/bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- 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)
|