diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-05-06 13:57:01 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-05-06 13:57:01 -0700 |
| commit | 271de175c9af5be4ccc7a0e5701c76d3ccb92677 (patch) | |
| tree | 08624b85629a42d9abca515389df397602154071 /drivers/base | |
| parent | 1dcd9896384ec3fe5c75829701d9babec7fe0d25 (diff) | |
| parent | 99e64c4a808c55cb173b69dc21d28a4420eb22c5 (diff) | |
Merge branch 'linux-3.14.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.14
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 45d0fa78981c..12b39dc2ad5c 100644 --- 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) |