of: handle both '/' and ':' in path strings
Commit106937e8cc
("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:106937e8cc
("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>
This commit is contained in:
Родитель
5ca1b0dd01
Коммит
721a09e95c
|
@ -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;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче