diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-12 06:11:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-18 15:50:16 -0800 |
| commit | ecfbf6fd9c03be7dfe3eafc3846641b9d463607b (patch) | |
| tree | c7383b5397df9dbf918f330e57324b3603a0f18d /drivers/base | |
| parent | 80b9bbefc345079bddc4959de016ba4074b0c8d6 (diff) | |
| download | linux-ecfbf6fd9c03be7dfe3eafc3846641b9d463607b.tar.gz linux-ecfbf6fd9c03be7dfe3eafc3846641b9d463607b.tar.bz2 linux-ecfbf6fd9c03be7dfe3eafc3846641b9d463607b.zip | |
Driver core: Fix device_add_attrs() error code path
If the addition of dev_attr_online fails, device_add_attrs() should
remove device attribute groups as well as type and class attribute
groups before returning an error code. Make that happen.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index aab43fbb8336..2b567177ef78 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -491,11 +491,13 @@ static int device_add_attrs(struct device *dev) if (device_supports_offline(dev) && !dev->offline_disabled) { error = device_create_file(dev, &dev_attr_online); if (error) - goto err_remove_type_groups; + goto err_remove_dev_groups; } return 0; + err_remove_dev_groups: + device_remove_groups(dev, dev->groups); err_remove_type_groups: if (type) device_remove_groups(dev, type->groups); |