summaryrefslogtreecommitdiff
path: root/cmd/fdt.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-09-04 14:56:45 -0400
committerTom Rini <trini@konsulko.com>2017-09-04 14:56:45 -0400
commitced0fd938d37605a22b2c24a351dc454e411cfbc (patch)
tree0ff5e9ae2388e557ccbc149d303cae6eae4c4fcb /cmd/fdt.c
parent0e88cdd17da393e7dd6040de6a3fda289c00a51e (diff)
parentd944bf6b5e5c0248eebb035d3f6a67dec70d7dd9 (diff)
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'cmd/fdt.c')
-rw-r--r--cmd/fdt.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/cmd/fdt.c b/cmd/fdt.c
index 118613f4051..d7654b2c4fd 100644
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -284,16 +284,14 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
len = 0;
} else {
ptmp = fdt_getprop(working_fdt, nodeoffset, prop, &len);
- if (!ptmp) {
- printf("prop (%s) not found!\n", prop);
- return 1;
- }
if (len > SCRATCHPAD) {
printf("prop (%d) doesn't fit in scratchpad!\n",
len);
return 1;
}
- memcpy(data, ptmp, len);
+ if (ptmp != NULL)
+ memcpy(data, ptmp, len);
+
ret = fdt_parse_prop(&argv[4], argc - 4, data, &len);
if (ret != 0)
return ret;