summaryrefslogtreecommitdiff
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-12-11 01:17:23 +0000
committerMark Brown <broonie@kernel.org>2018-12-11 01:17:23 +0000
commitd407c81adae57041ba82577e604e351f36b8afce (patch)
treedcacd9522369cde44919da0bafd843c3cc9e7bc2 /include/linux/regulator
parent40e020c129cfc991e8ab4736d2665351ffd1468d (diff)
parent2bb1666369339f69f227ad060c250afde94d5c69 (diff)
Merge branch 'regulator-4.20' into regulator-linus
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/consumer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 25602afd4844..f3f76051e8b0 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -508,7 +508,7 @@ static inline int regulator_get_error_flags(struct regulator *regulator,
static inline int regulator_set_load(struct regulator *regulator, int load_uA)
{
- return REGULATOR_MODE_NORMAL;
+ return 0;
}
static inline int regulator_allow_bypass(struct regulator *regulator,