* [PATCH] reset: Fix of_reset_control_get() for consistent return values
@ 2015-09-01 15:28 Alban Bedel
2015-09-02 15:09 ` Philipp Zabel
0 siblings, 1 reply; 4+ messages in thread
From: Alban Bedel @ 2015-09-01 15:28 UTC (permalink / raw)
To: Philipp Zabel; +Cc: linux-kernel, Alban Bedel
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] reset: Fix of_reset_control_get() for consistent return values
2015-09-01 15:28 [PATCH] reset: Fix of_reset_control_get() for consistent return values Alban Bedel
@ 2015-09-02 15:09 ` Philipp Zabel
2015-09-02 16:35 ` Alban
0 siblings, 1 reply; 4+ messages in thread
From: Philipp Zabel @ 2015-09-02 15:09 UTC (permalink / raw)
To: Alban Bedel; +Cc: linux-kernel
Hi Alban,
Am Dienstag, den 01.09.2015, 17:28 +0200 schrieb Alban Bedel:
> 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.
Is that true? As far as I can see, since commit bd69f73f2c81
("of: Create function for counting number of phandles in a property")
it returns the (positive) number of entries if index is negative and the
'resets' property exists and parses correctly (before it would return
-ENOENT). If there are parsing errors, it can also return -EINVAL.
regards
Philipp
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] reset: Fix of_reset_control_get() for consistent return values
2015-09-02 15:09 ` Philipp Zabel
@ 2015-09-02 16:35 ` Alban
2015-09-03 9:49 ` Philipp Zabel
0 siblings, 1 reply; 4+ messages in thread
From: Alban @ 2015-09-02 16:35 UTC (permalink / raw)
To: Philipp Zabel; +Cc: linux-kernel
On Wed, 02 Sep 2015 17:09:52 +0200
Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Hi Alban,
>
> Am Dienstag, den 01.09.2015, 17:28 +0200 schrieb Alban Bedel:
> > 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.
>
> Is that true? As far as I can see, since commit bd69f73f2c81
> ("of: Create function for counting number of phandles in a property")
> it returns the (positive) number of entries if index is negative and the
> 'resets' property exists and parses correctly (before it would return
> -ENOENT). If there are parsing errors, it can also return -EINVAL.
That's no really the case. If the property doesn't exists, or the
requested index is out of range, of_parse_phandle_with_args() always
return -ENOENT. This is important for optional properties.
However if the index is negative it always return -EINVAL,
independently of the property existence. And here it is what happen
when of_property_match_string() fails, leading to this inconsistence.
Alban
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] reset: Fix of_reset_control_get() for consistent return values
2015-09-02 16:35 ` Alban
@ 2015-09-03 9:49 ` Philipp Zabel
0 siblings, 0 replies; 4+ messages in thread
From: Philipp Zabel @ 2015-09-03 9:49 UTC (permalink / raw)
To: Alban; +Cc: linux-kernel
Hi Alban,
Am Mittwoch, den 02.09.2015, 18:35 +0200 schrieb Alban:
[...]
> That's no really the case. If the property doesn't exists, or the
> requested index is out of range, of_parse_phandle_with_args() always
> return -ENOENT. This is important for optional properties.
You are right, I've looked ad __of_parse_phandle_with_args and missed
that it's explicitly checked in of_parse_phandle_with_args. I have
applied your patch.
best regards
Philipp
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-09-03 9:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-01 15:28 [PATCH] reset: Fix of_reset_control_get() for consistent return values Alban Bedel
2015-09-02 15:09 ` Philipp Zabel
2015-09-02 16:35 ` Alban
2015-09-03 9:49 ` Philipp Zabel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).