Skip to content

L
linux
Commit 6b468562 authored by Mark Brown's avatar Mark Brown
Browse files
Options

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

parents 99305bdc b2661e98
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
drivers/regulator/core.c
View file @ 6b468562
...@@ -204,7 +204,7 @@ static struct device_node *of_get_regulator(struct device *dev, const char *supp ...@@ -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); regnode = of_parse_phandle(dev->of_node, prop_name, 0);
if (!regnode) { 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); prop_name, dev->of_node->full_name);
return NULL; return NULL;
} }
...@@ -293,7 +293,8 @@ static int regulator_check_current_limit(struct regulator_dev *rdev, ...@@ -293,7 +293,8 @@ static int regulator_check_current_limit(struct regulator_dev *rdev,
} }
/* operating mode constraint check */ /* 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) { switch (*mode) {
case REGULATOR_MODE_FAST: case REGULATOR_MODE_FAST:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7