UPSTREAM: regulator: core: Move registration of regulator device

The public functions to acquire a regulator, such as regulator_get(),
internally look-up the regulator from the list of regulators that have
been registered with the regulator device class. The registration of
a new regulator with the regulator device class happens before the
regulator has been completely setup. Therefore, it is possible that
the regulator could be acquired before it has been setup successfully.
To avoid this move the device registration of the regulator to the end
of the regulator setup and update the error exit path accordingly.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from commit c438b9d017362b65f6b1a9e54f7f35e7f873dc7c)

Change-Id: I9b33820c1ea748fdf5ccfb8949775b753af4a848
Signed-off-by: David Wu <david.wu@rock-chips.com>

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index d5cb2a8a1a0e8da03f9480c56aba09fb6bace9dc..2585d3f02f7463ba7ac26abe5113df0ee636b1f4 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -4043,14 +4043,6 @@ regulator_register(const struct regulator_desc *regulator_desc,
        if (ret < 0)
                goto wash;
 
-       ret = device_register(&rdev->dev);
-       if (ret != 0) {
-               put_device(&rdev->dev);
-               goto wash;
-       }
-
-       dev_set_drvdata(&rdev->dev, rdev);
-
        if (init_data && init_data->supply_regulator)
                rdev->supply_name = init_data->supply_regulator;
        else if (regulator_desc->supply_name)
@@ -4070,9 +4062,17 @@ regulator_register(const struct regulator_desc *regulator_desc,
                }
        }
 
-       rdev_init_debugfs(rdev);
        mutex_unlock(&regulator_list_mutex);
 
+       ret = device_register(&rdev->dev);
+       if (ret != 0) {
+               put_device(&rdev->dev);
+               goto unset_supplies;
+       }
+
+       dev_set_drvdata(&rdev->dev, rdev);
+       rdev_init_debugfs(rdev);
+
        /* try to resolve regulators supply since a new one was registered */
        class_for_each_device(&regulator_class, NULL, NULL,
                              regulator_register_resolve_supply);
@@ -4081,17 +4081,11 @@ regulator_register(const struct regulator_desc *regulator_desc,
 
 unset_supplies:
        unset_regulator_supplies(rdev);
-       regulator_ena_gpio_free(rdev);
-       device_unregister(&rdev->dev);
-       /* device core frees rdev */
-       goto out;
-
 wash:
        kfree(rdev->constraints);
        regulator_ena_gpio_free(rdev);
 clean:
        kfree(rdev);
-out:
        mutex_unlock(&regulator_list_mutex);
        kfree(config);
        return ERR_PTR(ret);