summaryrefslogtreecommitdiffstats
path: root/nicintel_spi.c
diff options
context:
space:
mode:
authorNiklas Söderlund <niso@kth.se>2013-08-23 23:29:23 +0000
committerStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2013-08-23 23:29:23 +0000
commit89edf36c177eec2b1a2cbbcaff48c4e9a946a190 (patch)
tree20c63c2ef9a36bd6ba61248d8bbc337cf4a509e5 /nicintel_spi.c
parent184c52c94191a354afb0cd2c91e9932e66a5cd3d (diff)
downloadflashrom-89edf36c177eec2b1a2cbbcaff48c4e9a946a190.tar.gz
flashrom-89edf36c177eec2b1a2cbbcaff48c4e9a946a190.tar.bz2
flashrom-89edf36c177eec2b1a2cbbcaff48c4e9a946a190.zip
Add additional error handling to pcidev_readbar() callers
This is mostly a leftover of Niklas' "remove exit call from pcidev_init" patch. While not explicitly necessary detecting errors early is usually a good idea. Corresponding to flashrom svn r1718. 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 b1bce6a69..11b26c7c2 100644
--- a/nicintel_spi.c
+++ b/nicintel_spi.c
@@ -173,6 +173,9 @@ int nicintel_spi_init(void)
return 1;
io_base_addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_0);
+ if (!io_base_addr)
+ return 1;
+
nicintel_spibar = rphysmap("Intel Gigabit NIC w/ SPI flash", io_base_addr, MEMMAP_SIZE);
/* Automatic restore of EECD on shutdown is not possible because EECD
* does not only contain FLASH_WRITES_DISABLED|FLASH_WRITES_ENABLED,