summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-03-16 07:45:32 -0600
committerTom Rini <trini@konsulko.com>2016-03-22 12:16:17 -0400
commit508b028a4c91afc76f95cecdbb5a9fc1142a29dd (patch)
tree559661f8055aee4841adbe5688aef7185f2d8320
parent9cff2d1e39bca4e456a61a3395611cafe2f8969e (diff)
downloadtalos-obmc-uboot-508b028a4c91afc76f95cecdbb5a9fc1142a29dd.tar.gz
talos-obmc-uboot-508b028a4c91afc76f95cecdbb5a9fc1142a29dd.zip
mkimage: Correct file being closed twice in fit_import_data()
The code flows through to the end of the function, so we don't need another close() before this. Remove it. Reported-by: Coverity (CID: 138504) Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
-rw-r--r--tools/fit_image.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/fit_image.c b/tools/fit_image.c
index 2c8d92f88d..31aa43cab3 100644
--- a/tools/fit_image.c
+++ b/tools/fit_image.c
@@ -530,6 +530,7 @@ static int fit_import_data(struct image_tool_params *params, const char *fname)
if (fd < 0) {
fprintf(stderr, "%s: Can't open %s: %s\n",
params->cmdname, fname, strerror(errno));
+ ret = -EIO;
goto err;
}
if (write(fd, fdt, new_size) != new_size) {
@@ -538,7 +539,6 @@ static int fit_import_data(struct image_tool_params *params, const char *fname)
ret = -EIO;
goto err;
}
- close(fd);
ret = 0;
OpenPOWER on IntegriCloud