Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 165370
b: refs/heads/master
c: a5d2abc
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown authored and Liam Girdwood committed Sep 22, 2009
1 parent 7bcad17 commit 2c7955f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a07ac217146e0fac18c80d93e02109f2c96574d0
refs/heads/master: a5d2abce4373810c0109c5939c0094ac16698625
8 changes: 8 additions & 0 deletions trunk/drivers/regulator/virtual.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ static void update_voltage_constraints(struct device *dev,

if (data->min_uV && data->max_uV
&& data->min_uV <= data->max_uV) {
dev_dbg(dev, "Requesting %d-%duV\n",
data->min_uV, data->max_uV);
ret = regulator_set_voltage(data->regulator,
data->min_uV, data->max_uV);
if (ret != 0) {
Expand All @@ -44,6 +46,7 @@ static void update_voltage_constraints(struct device *dev,
}

if (data->min_uV && data->max_uV && !data->enabled) {
dev_dbg(dev, "Enabling regulator\n");
ret = regulator_enable(data->regulator);
if (ret == 0)
data->enabled = 1;
Expand All @@ -53,6 +56,7 @@ static void update_voltage_constraints(struct device *dev,
}

if (!(data->min_uV && data->max_uV) && data->enabled) {
dev_dbg(dev, "Disabling regulator\n");
ret = regulator_disable(data->regulator);
if (ret == 0)
data->enabled = 0;
Expand All @@ -69,6 +73,8 @@ static void update_current_limit_constraints(struct device *dev,

if (data->max_uA
&& data->min_uA <= data->max_uA) {
dev_dbg(dev, "Requesting %d-%duA\n",
data->min_uA, data->max_uA);
ret = regulator_set_current_limit(data->regulator,
data->min_uA, data->max_uA);
if (ret != 0) {
Expand All @@ -80,6 +86,7 @@ static void update_current_limit_constraints(struct device *dev,
}

if (data->max_uA && !data->enabled) {
dev_dbg(dev, "Enabling regulator\n");
ret = regulator_enable(data->regulator);
if (ret == 0)
data->enabled = 1;
Expand All @@ -89,6 +96,7 @@ static void update_current_limit_constraints(struct device *dev,
}

if (!(data->min_uA && data->max_uA) && data->enabled) {
dev_dbg(dev, "Disabling regulator\n");
ret = regulator_disable(data->regulator);
if (ret == 0)
data->enabled = 0;
Expand Down

0 comments on commit 2c7955f

Please sign in to comment.