aboutsummaryrefslogtreecommitdiff
path: root/drivers/reset/core.c
diff options
context:
space:
mode:
authorAlban Bedel <albeu@free.fr>2015-09-01 17:28:31 +0200
committerPhilipp Zabel <p.zabel@pengutronix.de>2015-11-16 09:23:47 +0100
commit3d81216fde465e76c5eae98f61d3666163634395 (patch)
tree023f1529f76097af8c143587979744fea38e393d /drivers/reset/core.c
parentc0a13aa6da5da19f9eedb562b226ec585aabdca9 (diff)
downloadlinux-stericsson-3d81216fde465e76c5eae98f61d3666163634395.tar.gz
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>
Diffstat (limited to 'drivers/reset/core.c')
-rw-r--r--drivers/reset/core.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/reset/core.c b/drivers/reset/core.c
index 81ae17d15480..77cfc49218c6 100644
--- 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);