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>

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);