diff options
| author | stefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2013-08-23 23:29:23 +0000 |
|---|---|---|
| committer | stefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2013-08-23 23:29:23 +0000 |
| commit | c33530f5baea950b3e494f0c05c7fb5a0859f90b (patch) | |
| tree | 20c63c2ef9a36bd6ba61248d8bbc337cf4a509e5 /satamv.c | |
| parent | 455fd9f9870ce8c5436112d28def881b6fc59d55 (diff) | |
| download | flashrom-c33530f5baea950b3e494f0c05c7fb5a0859f90b.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.
Signed-off-by: Niklas Söderlund <niso@kth.se>
Signed-off-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>
git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1718 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
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. |