diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-24 12:01:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-24 12:01:58 -0700 |
| commit | 76429f1dedbc1815d875c9b68eefd30c95cb8fa9 (patch) | |
| tree | 0c7efa089ad10e6c503b9c3a5ccc6735ceb11ad3 /include | |
| parent | ff1e5b447e465da75dfdd0a4f4070cfef86a4155 (diff) | |
| parent | 38962571375149626cd282ef9d8e87e8faf21155 (diff) | |
| download | linux-76429f1dedbc1815d875c9b68eefd30c95cb8fa9.tar.bz2 | |
Merge tag 'regulator-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"A couple of things here:
- Fixes for pbias that didn't make it in during the merge window due
to the driver coming in via MMC. The conversion to use helpers is
a fix as it implements list_voltage() which the main user (MMC)
relies on for correct functioning.
- Change the !REGULATOR stub for optional regulators to return an
error rather than a dummy; this is more in keeping with the
intended use of optional regulators and fixes some issues seen MMC
where it got confused by a dummy being provided"
* tag 'regulator-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: core: Return error in get optional stub
regulator: pbias: Convert to use regmap helper functions
regulator: pbias: Fix is_enabled callback implementation
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regulator/consumer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index e530681bea70..1a4a8c157b31 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -258,14 +258,14 @@ regulator_get_exclusive(struct device *dev, const char *id) static inline struct regulator *__must_check regulator_get_optional(struct device *dev, const char *id) { - return NULL; + return ERR_PTR(-ENODEV); } static inline struct regulator *__must_check devm_regulator_get_optional(struct device *dev, const char *id) { - return NULL; + return ERR_PTR(-ENODEV); } static inline void regulator_put(struct regulator *regulator) |