diff options
| author | Tadas Slotkus <devtadas@gmail.com> | 2011-09-06 18:49:31 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2011-09-06 18:49:31 +0000 |
| commit | 0e3f1cf778e2b178142ca7d244813f96e065cc63 (patch) | |
| tree | abd43f82470017a31e2761882696b15c383c85c0 /chipset_enable.c | |
| parent | 48446c86ff80aa5bf68414ad97d264a113815240 (diff) | |
| download | ast2050-flashrom-0e3f1cf778e2b178142ca7d244813f96e065cc63.zip ast2050-flashrom-0e3f1cf778e2b178142ca7d244813f96e065cc63.tar.gz | |
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>
Diffstat (limited to 'chipset_enable.c')
| -rw-r--r-- | chipset_enable.c | 9 |
1 files changed, 4 insertions, 5 deletions
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 @@ static int enable_flash_ich_dc(struct pci_dev *dev, const char *name) 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 @@ static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name, /* 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 @@ static int enable_flash_sb400(struct pci_dev *dev, const char *name) if (!smbusdev) { msg_perr("ERROR: SMBus device not found. Aborting.\n"); - exit(1); + return ERROR_FATAL; } /* Enable some SMBus stuff. */ |
