summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 07:42:56 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 07:42:56 +0400
commitbdb7e45507893f4c509c539d442ed4962ac6fa0f (patch)
tree86c76eba665903dd3eaf97154b84516bb80e80e6 /drivers
parent1f9cc5f7716d664bfe32289ca61327be01a0a8e3 (diff)
parentfff15bef48e846d2670c86c95f8dbc3f84bbe866 (diff)
downloadlinux-bdb7e45507893f4c509c539d442ed4962ac6fa0f.tar.xz
Merge remote-tracking branch 'regulator/topic/log' into regulator-next
Diffstat (limited to 'drivers')
-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,
*min_uV = regulator->min_uV;
}
- if (*min_uV > *max_uV)
+ if (*min_uV > *max_uV) {
+ dev_err(regulator->dev, "Restricting voltage, %u-%uuV\n",
+ regulator->min_uV, regulator->max_uV);
return -EINVAL;
+ }
return 0;
}
@@ -880,7 +883,9 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,
/* final: [min_uV..max_uV] valid iff constraints valid */
if (max_uV < min_uV) {
- rdev_err(rdev, "unsupportable voltage constraints\n");
+ rdev_err(rdev,
+ "unsupportable voltage constraints %u-%uuV\n",
+ min_uV, max_uV);
return -EINVAL;
}