diff options
| author | Benoit Cousson <b-cousson@ti.com> | 2011-12-05 15:23:54 +0100 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-12-19 15:40:11 -0600 |
| commit | 88af7f58c6f1fa28d617392c791f11317bcb590d (patch) | |
| tree | 4787f62c5a7786819682a995c114506c33053e4a /drivers/of | |
| parent | 44ad56b7df54cbc8063b46883d183e4e2f09f831 (diff) | |
| download | linux-3.10-88af7f58c6f1fa28d617392c791f11317bcb590d.tar.gz linux-3.10-88af7f58c6f1fa28d617392c791f11317bcb590d.tar.bz2 linux-3.10-88af7f58c6f1fa28d617392c791f11317bcb590d.zip | |
of/base: Take NULL string into account for property with multiple strings
The current implementation just ignore any NULL string inserted in a
multiple strings property.
In some cases we can have a property with a fix number of strings but
not necessarily used, like for example in a list of valid pinmux modes.
prop = "uart_rx", "uart_tx", "", "", "safe_mode";
Do no skip NULL string and take them into account in
of_property_read_string_index and of_property_count_strings.
Reported-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/base.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 9b6588ef067..b7072437eb8 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -752,7 +752,7 @@ int of_property_read_string_index(struct device_node *np, const char *propname, for (i = 0; total < prop->length; total += l, p += l) { l = strlen(p) + 1; - if ((*p != 0) && (i++ == index)) { + if (i++ == index) { *output = p; return 0; } @@ -790,11 +790,9 @@ int of_property_count_strings(struct device_node *np, const char *propname) p = prop->value; - for (i = 0; total < prop->length; total += l, p += l) { + for (i = 0; total < prop->length; total += l, p += l, i++) l = strlen(p) + 1; - if (*p != 0) - i++; - } + return i; } EXPORT_SYMBOL_GPL(of_property_count_strings); |