Messages in this thread Patch in this message | | | From | Alban Bedel <> | Subject | [PATCH] reset: Fix of_reset_control_get() for consistent return values | Date | Tue, 1 Sep 2015 17:28:31 +0200 |
| |
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> --- drivers/reset/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/reset/core.c b/drivers/reset/core.c index 3cbc764..fd6ac9b 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -265,9 +265,12 @@ struct reset_control *of_reset_control_get(struct device_node *node, int rstc_id; int ret; - if (id) + if (id) { index = of_property_match_string(node, "reset-names", id); + if (index < 0) + return ERR_PTR(-ENOENT); + } ret = of_parse_phandle_with_args(node, "resets", "#reset-cells", index, &args); if (ret) -- 2.0.0
| |