Commit 168d7c4e authored May 31, 2016 by John Youn Committed by Philipp Zabel Jun 01, 2016

reset: Return -ENOTSUPP when not configured



Prior to commit 6c96f05c ("reset: Make [of_]reset_control_get[_foo]
functions wrappers"), the "optional" functions returned -ENOTSUPP when
CONFIG_RESET_CONTROLLER was not set.

Revert back to the old behavior by changing the new
__devm_reset_control_get() and __of_reset_control_get() functions to
return ERR_PTR(-ENOTSUPP) when compiled without CONFIG_RESET_CONTROLLER.

Otherwise they will return -EINVAL causing users to think that an error
occurred when CONFIG_RESET_CONTROLLER is not set.

Fixes: 6c96f05c ("reset: Make [of_]reset_control_get[_foo] functions wrappers")
Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

parent 42fa905b

include/linux/reset.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -71,14 +71,14 @@ static inline struct reset_control *__of_reset_control_get(
		struct device_node *node,
		const char *id, int index, int shared)
		{
		return ERR_PTR(-EINVAL);
		return ERR_PTR(-ENOTSUPP);
		}

		static inline struct reset_control *__devm_reset_control_get(
		struct device *dev,
		const char *id, int index, int shared)
		{
		return ERR_PTR(-EINVAL);
		return ERR_PTR(-ENOTSUPP);
		}

		#endif /* CONFIG_RESET_CONTROLLER */

Admin message