diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-13 13:21:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-13 13:21:17 -0400 |
| commit | 50be9f0e1ccc0909e65132cff216743a49046f97 (patch) | |
| tree | cbb6f9c3031ab81d5b0a775906727df844b0a618 /common | |
| parent | db3b1818b7a9711084255713ec14cb886eb79b12 (diff) | |
| parent | d21ffa2a2ebc366b8ca644324d76bb2924947373 (diff) | |
Merge branch '2020-03-13-master-imports'
- Address the regression with the 'gpio' command
- Fix mcfuart regression
- Other minor fixes
Diffstat (limited to 'common')
| -rw-r--r-- | common/image-fit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/common/image-fit.c b/common/image-fit.c index f3bb00c98a..4435bc4f1d 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1011,8 +1011,10 @@ int fit_image_get_data_and_size(const void *fit, int noffset, if (external_data) { debug("External Data\n"); ret = fit_image_get_data_size(fit, noffset, &len); - *data = fit + offset; - *size = len; + if (!ret) { + *data = fit + offset; + *size = len; + } } else { ret = fit_image_get_data(fit, noffset, data, size); } |