summaryrefslogtreecommitdiffstats
path: root/nicintel.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.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.c')
-rw-r--r--nicintel.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/nicintel.c b/nicintel.c
index 305657c78..98ba29f6c 100644
--- a/nicintel.c
+++ b/nicintel.c
@@ -76,12 +76,17 @@ int nicintel_init(void)
return 1;
addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_2);
+ if (!addr)
+ return 1;
+
nicintel_bar = rphysmap("Intel NIC flash", addr, NICINTEL_MEMMAP_SIZE);
if (nicintel_bar == ERROR_PTR)
return 1;
addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_0);
- /* FIXME: This is not an aligned mapping. Use 4k? */
+ if (!addr)
+ return 1;
+
nicintel_control_bar = rphysmap("Intel NIC control/status reg", addr, NICINTEL_CONTROL_MEMMAP_SIZE);
if (nicintel_control_bar == ERROR_PTR)
return 1;