From 89edf36c177eec2b1a2cbbcaff48c4e9a946a190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Fri, 23 Aug 2013 23:29:23 +0000 Subject: Add additional error handling to pcidev_readbar() callers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Stefan Tauner Acked-by: Stefan Tauner --- nicintel_spi.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'nicintel_spi.c') diff --git a/nicintel_spi.c b/nicintel_spi.c index b1bce6a..11b26c7 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, -- cgit v1.1