diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-30 20:38:47 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-30 20:38:47 -0500 |
| commit | 514d00e527320a96c682029f4982955700f1664b (patch) | |
| tree | 760a6e20566467356db07f68862f0088be0815b7 /lib/optee/optee.c | |
| parent | e7ab1cb3f0421ad8e8435a8258790e238c623ea2 (diff) | |
| parent | 018921ee79d3f30893614b3b2b63b588d8544f73 (diff) | |
Merge branch '2020-01-30-master-imports'
- Assorted minor fixes
- Revert 6dcb8ba4 from upstream libfdt to restore boot-time speed on
many platforms.
Diffstat (limited to 'lib/optee/optee.c')
| -rw-r--r-- | lib/optee/optee.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/optee/optee.c b/lib/optee/optee.c index 9b49eb8ee7..d4355c6d03 100644 --- a/lib/optee/optee.c +++ b/lib/optee/optee.c @@ -92,7 +92,7 @@ static int optee_copy_firmware_node(const void *old_blob, void *fdt_blob) offs = fdt_add_subnode(fdt_blob, offs, "optee"); if (offs < 0) - return ret; + return offs; /* copy the compatible property */ prop = fdt_getprop(old_blob, old_offs, "compatible", &len); |