summaryrefslogtreecommitdiffstats
path: root/nicintel_spi.c
diff options
context:
space:
mode:
authorNiklas Söderlund <niso@kth.se>2013-09-14 09:02:27 +0000
committerStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2013-09-14 09:02:27 +0000
commit5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8 (patch)
tree1d4a18ad60037ced5824c9f509dd77997f56054a /nicintel_spi.c
parent2d8b7ef4a84e4946619fa8e4d1b9fcaa15208440 (diff)
downloadflashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.tar.gz
flashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.tar.bz2
flashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.zip
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. Corresponding to flashrom svn r1745. Signed-off-by: Niklas Söderlund <niso@kth.se> Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'nicintel_spi.c')
-rw-r--r--nicintel_spi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/nicintel_spi.c b/nicintel_spi.c
index 11b26c7c2..faceedd1d 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