Kill all exit() calls in chipset_enable.c
Corresponding to flashrom svn r1429.
Signed-off-by: Tadas Slotkus <devtadas@gmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
diff --git a/chipset_enable.c b/chipset_enable.c
index 21f2e86..1c3d644 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -343,10 +343,7 @@
msg_perr("Error: fwh_idsel= specified, but no value given.\n");
idsel_garbage_out:
free(idsel);
- /* FIXME: Return failure here once internal_init() starts
- * to care about the return value of the chipset enable.
- */
- exit(1);
+ return ERROR_FATAL;
}
free(idsel);
@@ -489,6 +486,8 @@
/* Enable Flash Writes */
ret = enable_flash_ich_dc(dev, name);
+ if (ret == ERROR_FATAL)
+ return ret;
/* Get physical address of Root Complex Register Block */
tmp = pci_read_long(dev, 0xf0) & 0xffffc000;
@@ -894,7 +893,7 @@
if (!smbusdev) {
msg_perr("ERROR: SMBus device not found. Aborting.\n");
- exit(1);
+ return ERROR_FATAL;
}
/* Enable some SMBus stuff. */