Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / regulator / core.c

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index a46be221dbdcba78160781d223c7ee6e2f2f5665..679ad3d2ed23dad04fa8d655965b968a5ea1644e 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1403,7 +1403,9 @@ static int set_machine_constraints(struct regulator_dev *rdev,
                        rdev_err(rdev, "failed to enable\n");
                        return ret;
                }
-               rdev->use_count++;
+
+               if (rdev->constraints->always_on)
+                       rdev->use_count++;
        }
 
        print_constraints(rdev);
@@ -1844,6 +1846,7 @@ struct regulator *_regulator_get(struct device *dev, const char *id,
        struct regulator_dev *rdev;
        struct regulator *regulator;
        const char *devname = dev ? dev_name(dev) : "deviceless";
+       struct device_link *link;
        int ret;
 
        if (get_type >= MAX_GET_TYPE) {
@@ -1951,7 +1954,9 @@ struct regulator *_regulator_get(struct device *dev, const char *id,
                        rdev->use_count = 0;
        }
 
-       device_link_add(dev, &rdev->dev, DL_FLAG_STATELESS);
+       link = device_link_add(dev, &rdev->dev, DL_FLAG_STATELESS);
+       if (!IS_ERR_OR_NULL(link))
+               regulator->device_link = true;
 
        return regulator;
 }
@@ -2046,7 +2051,8 @@ static void _regulator_put(struct regulator *regulator)
        debugfs_remove_recursive(regulator->debugfs);
 
        if (regulator->dev) {
-               device_link_remove(regulator->dev, &rdev->dev);
+               if (regulator->device_link)
+                       device_link_remove(regulator->dev, &rdev->dev);
 
                /* remove any sysfs entries */
                sysfs_remove_link(&rdev->dev.kobj, regulator->supply_name);
@@ -4963,6 +4969,12 @@ static int generic_coupler_attach(struct regulator_coupler *coupler,
                return -EPERM;
        }
 
+       if (!rdev->constraints->always_on) {
+               rdev_err(rdev,
+                        "Coupling of a non always-on regulator is unimplemented\n");
+               return -ENOTSUPP;
+       }
+
        return 0;
 }
 
@@ -5198,6 +5210,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
        regulator_remove_coupling(rdev);
        mutex_unlock(&regulator_list_mutex);
 wash:
+       kfree(rdev->coupling_desc.coupled_rdevs);
        kfree(rdev->constraints);
        mutex_lock(&regulator_list_mutex);
        regulator_ena_gpio_free(rdev);