summaryrefslogtreecommitdiff
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-12-11 23:44:49 +0300
committerMark Brown <broonie@kernel.org>2018-12-11 23:44:49 +0300
commite6202e8249aa7115af65f2d80b43c132816224ef (patch)
tree8865dd722ad55bb5e6bd5d446057395336ed0169 /include/linux/regulator
parent2b96edb570709d6ca2e06842941c4bdf04b55f47 (diff)
parentd407c81adae57041ba82577e604e351f36b8afce (diff)
downloadlinux-e6202e8249aa7115af65f2d80b43c132816224ef.tar.xz
Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-4.21
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,