diff options
| author |   David Lechner <david@lechnology.com> | 2016-12-04 16:52:31 -0600 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2016-12-05 11:38:30 +0000 |
| commit | 30103b5b6432a51c3822a26dc340e35d91237f39 (patch) | |
| tree | 0806755f1615c0bc8598558b4a845ab1cf9c8291 /include/linux/regulator | |
| parent | regulator: core: Add new API to poll for error conditions (diff) | |
| download | linux-dev-30103b5b6432a51c3822a26dc340e35d91237f39.tar.xz linux-dev-30103b5b6432a51c3822a26dc340e35d91237f39.zip | |
regulator: Fix regulator_get_error_flags() signature mismatch
The function signature of does not match regulator_get_error_flags()
when CONFIG_REGULATOR is not defined vs. when it is not defined.
This makes both declarations match to prevent compiler errors.
Signed-off-by: David Lechner <david@lechnology.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/linux/regulator')
| -rw-r--r-- | include/linux/regulator/consumer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index 528eb1f5273e..ea0fffa5faeb 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -498,7 +498,8 @@ static inline unsigned int regulator_get_mode(struct regulator *regulator) return REGULATOR_MODE_NORMAL; } -static inline int regulator_get_error_flags(struct regulator *regulator) +static inline int regulator_get_error_flags(struct regulator *regulator, + unsigned int *flags) { return -EINVAL; } |