Commit 3d81216f authored Sep 01, 2015 by Alban Bedel Committed by Philipp Zabel Nov 16, 2015

reset: Fix of_reset_control_get() for consistent return values



When of_reset_control_get() is called without connection ID it returns
-ENOENT when the 'resets' property doesn't exists or is an empty entry.
However when a connection ID is given it returns -EINVAL when the 'resets'
property doesn't exists or the requested name can't be found. This is
because the error code returned by of_property_match_string() is just
passed down as an index to of_parse_phandle_with_args(), which then
returns -EINVAL.

To get a consistent return value with both code paths we must return
-ENOENT when of_property_match_string() fails.

Signed-off-by: Alban Bedel <albeu@free.fr>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

parent c0a13aa6

drivers/reset/core.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -215,9 +215,12 @@ struct reset_control of_reset_control_get(struct device_node node,
		{
		int index = 0;

		if (id)
		if (id) {
		index = of_property_match_string(node,
		"reset-names", id);
		if (index < 0)
		return ERR_PTR(-ENOENT);
		}
		return of_reset_control_get_by_index(node, index);
		}
		EXPORT_SYMBOL_GPL(of_reset_control_get);

Admin message