From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brian Norris Subject: [PATCH 1/2] of: handle both '/' and ':' in path strings Date: Tue, 17 Mar 2015 12:30:31 -0700 Message-ID: <1426620632-23383-1-git-send-email-computersforpeace@gmail.com> References: <1425924225-22748-2-git-send-email-leif.lindholm@linaro.org> Return-path: In-Reply-To: <1425924225-22748-2-git-send-email-leif.lindholm@linaro.org> Sender: linux-kernel-owner@vger.kernel.org To: Rob Herring Cc: Brian Norris , Peter Hurley , Leif Lindholm , stable@vger.kernel.org, Grant Likely , Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: devicetree@vger.kernel.org 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 Cc: stable@vger.kernel.org --- This is for -stable only because the regression is marked for stable. Not sure the first one deserves to go to -stable, actually... drivers/of/base.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index adb8764861c0..966d6fdcf427 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; -- 1.9.1