aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-09 22:42:56 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-09 22:42:56 -0500
commitbdb7e45507893f4c509c539d442ed4962ac6fa0f (patch)
tree86c76eba665903dd3eaf97154b84516bb80e80e6 /drivers/regulator
parent1f9cc5f7716d664bfe32289ca61327be01a0a8e3 (diff)
parentfff15bef48e846d2670c86c95f8dbc3f84bbe866 (diff)
Merge remote-tracking branch 'regulator/topic/log' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index d5f84c1b258b..35c149bb2ad3 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -199,8 +199,11 @@ static int regulator_check_consumers(struct regulator_dev *rdev,
199 *min_uV = regulator->min_uV; 199 *min_uV = regulator->min_uV;
200 } 200 }
201 201
202 if (*min_uV > *max_uV) 202 if (*min_uV > *max_uV) {
203 dev_err(regulator->dev, "Restricting voltage, %u-%uuV\n",
204 regulator->min_uV, regulator->max_uV);
203 return -EINVAL; 205 return -EINVAL;
206 }
204 207
205 return 0; 208 return 0;
206} 209}
@@ -880,7 +883,9 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,
880 883
881 /* final: [min_uV..max_uV] valid iff constraints valid */ 884 /* final: [min_uV..max_uV] valid iff constraints valid */
882 if (max_uV < min_uV) { 885 if (max_uV < min_uV) {
883 rdev_err(rdev, "unsupportable voltage constraints\n"); 886 rdev_err(rdev,
887 "unsupportable voltage constraints %u-%uuV\n",
888 min_uV, max_uV);
884 return -EINVAL; 889 return -EINVAL;
885 } 890 }
886 891