driver core: Return proper error code when dev_set_name() fails

Whe device_add() tries to assign a device name with help of
dev_set_name() the error path explicitly uses -EINVAL, while
the function may return something different.

Signed-off-by: Andy Shevchenko <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 6ceaf50f5a671e008a4b954002b6cc262624f10d..eb3a93dd70460428664051eafaa17705e0924d4f 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -3530,18 +3530,17 @@ int device_add(struct device *dev)
         * the name, and force the use of dev_name()
         */
        if (dev->init_name) {
-               dev_set_name(dev, "%s", dev->init_name);
+               error = dev_set_name(dev, "%s", dev->init_name);
                dev->init_name = NULL;
        }
 
+       if (dev_name(dev))
+               error = 0;
        /* subsystems can specify simple device enumeration */
-       if (!dev_name(dev) && dev->bus && dev->bus->dev_name)
-               dev_set_name(dev, "%s%u", dev->bus->dev_name, dev->id);
-
-       if (!dev_name(dev)) {
-               error = -EINVAL;
+       else if (dev->bus && dev->bus->dev_name)
+               error = dev_set_name(dev, "%s%u", dev->bus->dev_name, dev->id);
+       if (error)
                goto name_error;
-       }
 
        pr_debug("device: '%s': %s\n", dev_name(dev), __func__);