mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/3] reset: Fix of_reset_control_get() for consistent return values
@ 2022-08-05 12:59 Ahmad Fatoum
  2022-08-05 12:59 ` [PATCH 2/3] reset: implement reset_control_get_optional() Ahmad Fatoum
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Ahmad Fatoum @ 2022-08-05 12:59 UTC (permalink / raw)
  To: barebox; +Cc: Ahmad Fatoum

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>
[afa: ported from Linux 3d81216fde465e76c5eae98f61d3666163634395]
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 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 4355c3415eb0..93fbaeccafd2 100644
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@ -236,8 +236,11 @@ 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);
 }
-- 
2.30.2




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-08-08 12:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-05 12:59 [PATCH 1/3] reset: Fix of_reset_control_get() for consistent return values Ahmad Fatoum
2022-08-05 12:59 ` [PATCH 2/3] reset: implement reset_control_get_optional() Ahmad Fatoum
2022-08-05 12:59 ` [PATCH 3/3] reset: implement reset_control_get_count() Ahmad Fatoum
2022-08-08 12:07 ` [PATCH 1/3] reset: Fix of_reset_control_get() for consistent return values Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox