Merge 5.14-rc3 into driver-core-next

We need the driver-core fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --combined drivers/base/auxiliary.c
index 0c86f5b,6a30264..9230c94
--- 1/drivers/base/auxiliary.c
--- 2/drivers/base/auxiliary.c
+++ b/drivers/base/auxiliary.c
@@@ -79,7 -79,7 +79,7 @@@ static int auxiliary_bus_probe(struct d
        return ret;
  }
  
 -static int auxiliary_bus_remove(struct device *dev)
 +static void auxiliary_bus_remove(struct device *dev)
  {
        struct auxiliary_driver *auxdrv = to_auxiliary_drv(dev->driver);
        struct auxiliary_device *auxdev = to_auxiliary_dev(dev);
@@@ -87,6 -87,8 +87,6 @@@
        if (auxdrv->remove)
                auxdrv->remove(auxdev);
        dev_pm_domain_detach(dev, true);
 -
 -      return 0;
  }
  
  static void auxiliary_bus_shutdown(struct device *dev)
@@@ -229,6 -231,8 +229,8 @@@ EXPORT_SYMBOL_GPL(auxiliary_find_device
  int __auxiliary_driver_register(struct auxiliary_driver *auxdrv,
                                struct module *owner, const char *modname)
  {
+       int ret;
+ 
        if (WARN_ON(!auxdrv->probe) || WARN_ON(!auxdrv->id_table))
                return -EINVAL;
  
@@@ -244,7 -248,11 +246,11 @@@
        auxdrv->driver.bus = &auxiliary_bus_type;
        auxdrv->driver.mod_name = modname;
  
-       return driver_register(&auxdrv->driver);
+       ret = driver_register(&auxdrv->driver);
+       if (ret)
+               kfree(auxdrv->driver.name);
+ 
+       return ret;
  }
  EXPORT_SYMBOL_GPL(__auxiliary_driver_register);