diff options
| author | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-09-14 09:02:27 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-09-14 09:02:27 +0000 |
| commit | ed2e1e479a6f445b9053b5ce014bb84ed56af9e9 (patch) | |
| tree | 1d4a18ad60037ced5824c9f509dd77997f56054a /nicintel_spi.c | |
| parent | a782c3ef48ffde52432aa0ac716a9a45adc83ac0 (diff) | |
| download | flashrom-ed2e1e479a6f445b9053b5ce014bb84ed56af9e9.zip flashrom-ed2e1e479a6f445b9053b5ce014bb84ed56af9e9.tar.gz | |
Remove exit call and mayfail parameter from physmap_common()
The only call path where exit was reached was from physmap functions.
Callers of physmap() et al. which were not prepared to handle
ERROR_PTR return values have been adjusted.
physmap_try_ro() has been renamed to physmap_ro() and physmap_common()
slightly refactored due to the now removed *FAIL parameters.
Binary file (standard input) matches
Corresponding to flashrom svn r1745.
Diffstat (limited to 'nicintel_spi.c')
| -rw-r--r-- | nicintel_spi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nicintel_spi.c b/nicintel_spi.c index 11b26c7..faceedd 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -177,6 +177,9 @@ int nicintel_spi_init(void) return 1; nicintel_spibar = rphysmap("Intel Gigabit NIC w/ SPI flash", io_base_addr, MEMMAP_SIZE); + if (nicintel_spibar == ERROR_PTR) + return 1; + /* Automatic restore of EECD on shutdown is not possible because EECD * does not only contain FLASH_WRITES_DISABLED|FLASH_WRITES_ENABLED, * but other bits with side effects as well. Those other bits must be |
