From: Simon Glass <sjg@chromium.org>
Date: Wed, 16 Mar 2016 13:45:32 +0000 (-0600)
Subject: mkimage: Correct file being closed twice in fit_import_data()
X-Git-Tag: v2016.05-rc1~214
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=508b028a4c91afc76f95cecdbb5a9fc1142a29dd;p=u-boot

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>
---

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;