summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTim Kryger <tim.kryger@linaro.org>2014-04-17 11:55:24 -0700
committerMark Brown <broonie@linaro.org>2014-04-18 15:11:54 +0100
commitdf7926fffa9a4c0bceb0189386b4c5edc012fcbb (patch)
tree7c038284799f2ad38d3743e00378d554fe6b7254 /include
parentc9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff)
downloadlinux-df7926fffa9a4c0bceb0189386b4c5edc012fcbb.tar.gz
linux-df7926fffa9a4c0bceb0189386b4c5edc012fcbb.tar.bz2
linux-df7926fffa9a4c0bceb0189386b4c5edc012fcbb.zip
regulator: core: Return error in get optional stub
Drivers that call regulator_get_optional are tolerant to the absence of that regulator. By modifying the value returned from the stub function to match that seen when a regulator isn't present, callers can wrap the regulator logic with an IS_ERR based conditional even if they happen to call regulator_is_supported_voltage. This improves efficiency as well as eliminates the possibility for a very subtle bug. Signed-off-by: Tim Kryger <tim.kryger@linaro.org> Reviewed-by: Alex Elder <elder@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/regulator/consumer.h4
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)