Merge remote-tracking branch 'regulator/topic/core' into regulator-next

[linux-block.git] / drivers / regulator / core.c

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 5c1519b229e0e5cd718e4694cf0b27cde1c73f6d..ee13c47addf1b76cb96917c63739d2cb1ff096a1 100644 (file)
--- 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: