summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-03-07 09:25:02 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-03-07 09:25:02 +0100
commit2331b1d8e8d7aabe52b4fd65ca200cf8288aec88 (patch)
treeb72e8f7f08c76f91575a4a652655923821b9904b /scripts
parent9c2aa617030a44f3d336b5fef3861eac142290d2 (diff)
parentb3cd25785571160bd0f18e3da8d2101fcf415481 (diff)
downloadbarebox-2331b1d8e8d7aabe52b4fd65ca200cf8288aec88.tar.gz
barebox-2331b1d8e8d7aabe52b4fd65ca200cf8288aec88.tar.xz
Merge branch 'for-next/marvell'
Conflicts: arch/arm/dts/Makefile
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kwbimage.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/kwbimage.c b/scripts/kwbimage.c
index cd87456097..f8abeb1781 100644
--- a/scripts/kwbimage.c
+++ b/scripts/kwbimage.c
@@ -701,18 +701,18 @@ static int image_create_payload(void *payload_start, size_t payloadsz,
if (ret < 0) {
fprintf(stderr, "Cannot stat payload file %s\n",
payload_filename);
+ fclose(payload);
return ret;
}
ret = fread(payload_start, s.st_size, 1, payload);
+ fclose(payload);
if (ret != 1) {
fprintf(stderr, "Cannot read payload file %s\n",
payload_filename);
return -1;
}
- fclose(payload);
-
*payload_checksum = image_checksum32(payload_start, payloadsz);
return 0;
}
@@ -1343,6 +1343,7 @@ static int image_create(const char *input, const char *output,
rewind(fcfg);
ret = image_create_config_parse(fcfg, image_cfg, &cfgn);
+ fclose(fcfg);
if (ret) {
free(image_cfg);
return -1;