diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-06-25 16:17:21 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-06-25 16:19:06 +0800 |
| commit | bd4e9a26373331ef6f185500c72a8836eb7c82d9 (patch) | |
| tree | 13384e7649be7bb88ab9524efcbc602be85d5020 /drivers/base | |
| parent | 2528dbd348dd541e090594b7aac3f62351078388 (diff) | |
| parent | 2cb9802eeb7f919f97df05b16ec128f4f5af366d (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-15.07-android
Conflicts:
fs/exec.c
Solutions:
follow commit d221244a7
sched: move no_new_privs into new atomic flags
to use task_no_new_privs(current).
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) |