diff options
| author | Mark Brown <broonie@linaro.org> | 2014-04-23 08:50:11 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-23 08:50:11 -0400 |
| commit | 5c437f4241cd76183e470d0141f37cd79df6b36f (patch) | |
| tree | dba9cd2620f440e082374b4ac2f1f313ed8989dd /include | |
| parent | a798c10faf62a505d24e5f6213fbaf904a39623f (diff) | |
| parent | df7926fffa9a4c0bceb0189386b4c5edc012fcbb (diff) | |
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
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) | |||
| 258 | static inline struct regulator *__must_check | 258 | static inline struct regulator *__must_check |
| 259 | regulator_get_optional(struct device *dev, const char *id) | 259 | regulator_get_optional(struct device *dev, const char *id) |
| 260 | { | 260 | { |
| 261 | return NULL; | 261 | return ERR_PTR(-ENODEV); |
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | 264 | ||
| 265 | static inline struct regulator *__must_check | 265 | static inline struct regulator *__must_check |
| 266 | devm_regulator_get_optional(struct device *dev, const char *id) | 266 | devm_regulator_get_optional(struct device *dev, const char *id) |
| 267 | { | 267 | { |
| 268 | return NULL; | 268 | return ERR_PTR(-ENODEV); |
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | static inline void regulator_put(struct regulator *regulator) | 271 | static inline void regulator_put(struct regulator *regulator) |