Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

reset: Fix of_reset_control_get() for consistent return values

Browse Source 
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>
This commit is contained in:
Alban Bedel 2015-09-01 17:28:31 +02:00 committed by Philipp Zabel
parent c0a13aa6da
commit 3d81216fde
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/reset/core.c
View File

@ -215,9 +215,12 @@ struct reset_control *of_reset_control_get(struct device_node *node,
{ {
int index = 0; int index = 0;
if (id) if (id) {
index = of_property_match_string(node, index = of_property_match_string(node,
"reset-names", id); "reset-names", id);
if (index < 0)
return ERR_PTR(-ENOENT);
}
return of_reset_control_get_by_index(node, index); return of_reset_control_get_by_index(node, index);
} }
EXPORT_SYMBOL_GPL(of_reset_control_get); EXPORT_SYMBOL_GPL(of_reset_control_get);