]> git.karo-electronics.de Git - linux-beck.git/commitdiff
regulator: Enable supply regulator if child rail is enabled.
authorLaxman Dewangan <ldewangan@nvidia.com>
Mon, 2 Jan 2012 07:38:45 +0000 (13:08 +0530)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 2 Jan 2012 11:36:02 +0000 (11:36 +0000)
During regulator_register, the rail is set on the provided
machine constraints and if it is enabled then it is also
require to enable the supply regulator. This will make sure
that:
   1. Proper reference count for supply regulator to be maintain.
   2. Supply regulator should be enable when given rail is enabled.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/core.c

index e70e15c4aa284ede391e6bc6cd31a1b92e719bf9..eb750a1ed7fee76a3b4e5adbb67aa7d394cd9767 100644 (file)
@@ -2802,6 +2802,14 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
                ret = set_supply(rdev, r);
                if (ret < 0)
                        goto scrub;
+
+               /* Enable supply if rail is enabled */
+               if (rdev->desc->ops->is_enabled &&
+                               rdev->desc->ops->is_enabled(rdev)) {
+                       ret = regulator_enable(rdev->supply);
+                       if (ret < 0)
+                               goto scrub;
+               }
        }
 
        /* add consumers devices */