From 508b028a4c91afc76f95cecdbb5a9fc1142a29dd Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Wed, 16 Mar 2016 07:45:32 -0600
Subject: [PATCH] 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>
---
tools/fit_image.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
--
2.39.5