Author: uwe Date: Tue Sep 6 20:49:31 2011 New Revision: 1429 URL: http://flashrom.org/trac/flashrom/changeset/1429
Log: Kill all exit() calls in chipset_enable.c. Signed-off-by: Tadas Slotkus <[email protected]> Acked-by: Uwe Hermann <[email protected]> Modified: trunk/chipset_enable.c Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Tue Sep 6 20:17:02 2011 (r1428) +++ trunk/chipset_enable.c Tue Sep 6 20:49:31 2011 (r1429) @@ -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. */ _______________________________________________ flashrom mailing list [email protected] http://www.flashrom.org/mailman/listinfo/flashrom
