summaryrefslogtreecommitdiff
path: root/common/fdt_region.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-07-24 15:42:06 +0300
committerTom Rini <trini@konsulko.com>2020-07-24 15:42:06 +0300
commit7208396bbf1df1c7a85d263b7ff054e6b45d8240 (patch)
tree41b20866e0a94e34ca76e54a2745ca7a5ba0889b /common/fdt_region.c
parent5d3a21df6694ebd66d5c34c9d62a26edc7456fc7 (diff)
downloadu-boot-7208396bbf1df1c7a85d263b7ff054e6b45d8240.tar.xz
Revert "Merge tag 'dm-pull-20jul20' of git://git.denx.de/u-boot-dm"
This reverts commit 5d3a21df6694ebd66d5c34c9d62a26edc7456fc7, reversing changes made to 56d37f1c564107e27d873181d838571b7d7860e7. Unfortunately this is causing CI failures: https://travis-ci.org/github/trini/u-boot/jobs/711313649 Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/fdt_region.c')
-rw-r--r--common/fdt_region.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/common/fdt_region.c b/common/fdt_region.c
index ff12c518e9..667659054a 100644
--- a/common/fdt_region.c
+++ b/common/fdt_region.c
@@ -65,8 +65,6 @@ int fdt_find_regions(const void *fdt, char * const inc[], int inc_count,
stop_at = offset;
prop = fdt_get_property_by_offset(fdt, offset, NULL);
str = fdt_string(fdt, fdt32_to_cpu(prop->nameoff));
- if (!str)
- return -FDT_ERR_BADSTRUCTURE;
if (str_in_list(str, exc_prop, exc_prop_count))
include = 0;
break;