Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

5c437f42 · Mark Brown · a798c10f · df7926ff · 5c437f42
Commit 5c437f42 authored Apr 23, 2014 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

include/linux/regulator/consumer.h include/linux/regulator/consumer.h +2 -2

No files found.
--- 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)