diff options
| author | Niklas Söderlund <niso@kth.se> | 2013-08-23 23:29:23 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-08-23 23:29:23 +0000 |
| commit | 89edf36c177eec2b1a2cbbcaff48c4e9a946a190 (patch) | |
| tree | 20c63c2ef9a36bd6ba61248d8bbc337cf4a509e5 /satamv.c | |
| parent | 184c52c94191a354afb0cd2c91e9932e66a5cd3d (diff) | |
| download | ast2050-flashrom-89edf36c177eec2b1a2cbbcaff48c4e9a946a190.zip ast2050-flashrom-89edf36c177eec2b1a2cbbcaff48c4e9a946a190.tar.gz | |
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 'satamv.c')
| -rw-r--r-- | satamv.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -88,6 +88,9 @@ int satamv_init(void) return 1; addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_0); + if (!addr) + return 1; + mv_bar = rphysmap("Marvell 88SX7042 registers", addr, 0x20000); if (mv_bar == ERROR_PTR) return 1; @@ -136,6 +139,9 @@ int satamv_init(void) /* Get I/O BAR location. */ tmp = pcidev_readbar(dev, PCI_BASE_ADDRESS_2); + if (!addr) + return 1; + /* Truncate to reachable range. * FIXME: Check if the I/O BAR is actually reachable. * This is an arch specific check. |
