summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-12-12 12:17:23 +0000
committerMark Brown <broonie@kernel.org>2016-12-12 12:17:23 +0000
commit6b46856246592f860840acf32fcb732111c1c9eb (patch)
tree8e9a8a572a0fafe1ea6e49606432fb970ac7490b
parent99305bdc7c84e61635e542f3cd81f29d1964ea5a (diff)
parentb2661e983f5b55d4895673bd5eafa14b1e7c8881 (diff)
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
-rw-r--r--drivers/regulator/core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 5c1519b229e0..ee13c47addf1 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -204,7 +204,7 @@ static struct device_node *of_get_regulator(struct device *dev, const char *supp
regnode = of_parse_phandle(dev->of_node, prop_name, 0);
if (!regnode) {
- dev_dbg(dev, "Looking up %s property in node %s failed",
+ dev_dbg(dev, "Looking up %s property in node %s failed\n",
prop_name, dev->of_node->full_name);
return NULL;
}
@@ -293,7 +293,8 @@ static int regulator_check_current_limit(struct regulator_dev *rdev,
}
/* operating mode constraint check */
-static int regulator_mode_constrain(struct regulator_dev *rdev, int *mode)
+static int regulator_mode_constrain(struct regulator_dev *rdev,
+ unsigned int *mode)
{
switch (*mode) {
case REGULATOR_MODE_FAST: