commit 89edf36c177eec2b1a2cbbcaff48c4e9a946a190
author Niklas Söderlund <niso@kth.se> Fri Aug 23 23:29:23 2013 +0000
committer Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> Fri Aug 23 23:29:23 2013 +0000
tree 20c63c2ef9a36bd6ba61248d8bbc337cf4a509e5
parent 184c52c94191a354afb0cd2c91e9932e66a5cd3d

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>

ogp_spi.c

diff --git a/ogp_spi.c b/ogp_spi.c
index 3aed6e8..f8f7b2d 100644
--- a/ogp_spi.c
+++ b/ogp_spi.c
@@ -131,6 +131,9 @@
 		return 1;
 
 	io_base_addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_0);
+	if (!io_base_addr)
+		return 1;
+
 	ogp_spibar = rphysmap("OGP registers", io_base_addr, 4096);
 	if (ogp_spibar == ERROR_PTR)
 		return 1;