summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-23 13:50:11 +0100
committerMark Brown <broonie@linaro.org>2014-04-23 13:50:11 +0100
commit5c437f4241cd76183e470d0141f37cd79df6b36f (patch)
treedba9cd2620f440e082374b4ac2f1f313ed8989dd
parenta798c10faf62a505d24e5f6213fbaf904a39623f (diff)
parentdf7926fffa9a4c0bceb0189386b4c5edc012fcbb (diff)
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
-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)