summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Leger <cleger@kalray.eu>2017-12-14 13:40:56 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-12-15 08:27:03 +0100
commit21bbc2f97e2953dc633175f3ca045972ea2c7e61 (patch)
tree527654f12ef4f892c1ebfc0ab64f97167bf2f2ad
parentd67aed662306dff4b2ab3064ebf81ef86cae1172 (diff)
downloadbarebox-21bbc2f97e2953dc633175f3ca045972ea2c7e61.tar.gz
barebox-21bbc2f97e2953dc633175f3ca045972ea2c7e61.tar.xz
Bootm: remove uimage_close done later in bootm_boot
From 24e24f9998342b23cd8de4145c8098f93c60cdc7 Mon Sep 17 00:00:00 2001 From: Clement Leger <clement.leger@kalray.eu> Date: Thu, 14 Dec 2017 13:29:50 +0100 Subject: [PATCH] Bootm: fix double uimage_close When uimage crc fails, the error handling path call uimage_close in bootm_open_os_uimage and also in bootm_boot. This leads to crash/exception. Keep the main error handling path in bootm_boot and remove uimage_close from bootm_open_os_uimage to avoid double uimage_close. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--common/bootm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/common/bootm.c b/common/bootm.c
index eebaa799f5..c23898bea7 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -455,7 +455,6 @@ static int bootm_open_os_uimage(struct image_data *data)
if (ret) {
printf("Checking data crc failed with %s\n",
strerror(-ret));
- uimage_close(data->os);
return ret;
}
}