diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-14 12:16:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-14 12:16:43 -0500 |
| commit | b7127e3c51db4cc3ebe470153452b66c1f0ff83e (patch) | |
| tree | 95456ea05894b4743e883db529b09f0aa42bb26d /lib/libfdt/fdt_overlay.c | |
| parent | 83c2f0b451f1656a25272357aa60f6887d5564df (diff) | |
| parent | b05bf6c75d03c925737e228472b694cbeaa503c2 (diff) | |
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'lib/libfdt/fdt_overlay.c')
| -rw-r--r-- | lib/libfdt/fdt_overlay.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/libfdt/fdt_overlay.c b/lib/libfdt/fdt_overlay.c index bb414041297..56cb70ed444 100644 --- a/lib/libfdt/fdt_overlay.c +++ b/lib/libfdt/fdt_overlay.c @@ -359,6 +359,9 @@ static int overlay_fixup_one_phandle(void *fdt, void *fdto, int symbol_off, fixup_off; int prop_len; + if (symbols_off < 0) + return symbols_off; + symbol_path = fdt_getprop(fdt, symbols_off, label, &prop_len); if (!symbol_path) @@ -492,7 +495,9 @@ static int overlay_fixup_phandles(void *fdt, void *fdto) /* We can have overlays without any fixups */ fixups_off = fdt_path_offset(fdto, "/__fixups__"); - if ((fixups_off < 0 && (fixups_off != -FDT_ERR_NOTFOUND))) + if (fixups_off == -FDT_ERR_NOTFOUND) + return 0; /* nothing to do */ + if (fixups_off < 0) return fixups_off; /* And base DTs without symbols */ |