Skip to content

Commit

Permalink
Merge remote-tracking branch 'regulator/topic/log' into regulator-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Dec 10, 2012
2 parents 1f9cc5f + fff15be commit bdb7e45
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit bdb7e45

Please sign in to comment.