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>

diff --git a/drivers/reset/core.c b/drivers/reset/core.c
index 81ae17d1548020993062e3a12c85a87417d3f5f0..77cfc49218c63b27e28c8a2848877b04c4e8783c 100644 (file)
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@ -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);