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

git-mirror · Apr 23, 2014 · 5c437f4 · 5c437f4
2 parents a798c10 + df7926f
commit 5c437f4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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)