diff options
authorBrian Norris <computersforpeace@gmail.com>2015-03-17 12:30:31 -0700
committerAlex Shi <alex.shi@linaro.org>2015-12-16 15:29:30 +0800
commit37e8e4f1465886675b03c37e9221658568ceb8f7 (patch)
parent1e89a5c2cbbb455f73946372782f19b84f4d80c9 (diff)
of: handle both '/' and ':' in path stringsv3.18/topic/of-overlay
Commit 106937e8ccdc ("of: fix handling of '/' in options for of_find_node_by_path()") caused a regression in OF handling of stdout-path. While it fixes some cases which have '/' after the ':', it breaks cases where there is more than one '/' *before* the ':'. For example, it breaks this boot string stdout-path = "/rdb/serial@f040ab00:115200"; So rather than doing sequentialized checks (first for '/', then for ':'; or vice versa), to get the correct behavior we need to check for the first occurrence of either one of them. It so happens that the handy strcspn() helper can do just that. Fixes: 106937e8ccdc ("of: fix handling of '/' in options for of_find_node_by_path()") Signed-off-by: Brian Norris <computersforpeace@gmail.com> Cc: stable@vger.kernel.org # 3.19 Acked-by: Leif Lindholm <leif.lindholm@linaro.org> Signed-off-by: Rob Herring <robh@kernel.org> (cherry picked from commit 721a09e95c786346b4188863a1cfa3909c76f690) Signed-off-by: Alex Shi <alex.shi@linaro.org>
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 0b2e4dc40a1f..df9626747afb 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -715,13 +715,8 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent,
struct device_node *child;
int len;
- const char *end;
- end = strchr(path, ':');
- if (!end)
- end = strchrnul(path, '/');
- len = end - path;
+ len = strcspn(path, "/:");
if (!len)
return NULL;