Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c437f42 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents a798c10f df7926ff

include/linux/regulator/consumer.h

+2 −2
Original line number Diff line number Diff line
@@ -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)