mkimage: Correct file being closed twice in fit_import_data()
authorSimon Glass <sjg@chromium.org>
Wed, 16 Mar 2016 13:45:32 +0000 (07:45 -0600)
committerTom Rini <trini@konsulko.com>
Tue, 22 Mar 2016 16:16:17 +0000 (12:16 -0400)
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

index 2c8d92f88da5545675dc8175bddadf8cfa44fa09..31aa43cab37014e7dffcaf4bc41e3ca9bca5f591 100644 (file)
@@ -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;