diff options
| author | Niklas Söderlund <niso@kth.se> | 2013-09-14 09:02:27 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-09-14 09:02:27 +0000 |
| commit | 5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8 (patch) | |
| tree | 1d4a18ad60037ced5824c9f509dd77997f56054a /dmi.c | |
| parent | 2d8b7ef4a84e4946619fa8e4d1b9fcaa15208440 (diff) | |
| download | flashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.tar.gz flashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.tar.bz2 flashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.zip | |
Remove exit call and mayfail parameter from physmap_common()
The only call path where exit was reached was from physmap functions.
Callers of physmap() et al. which were not prepared to handle
ERROR_PTR return values have been adjusted.
physmap_try_ro() has been renamed to physmap_ro() and physmap_common()
slightly refactored due to the now removed *FAIL parameters.
Corresponding to flashrom svn r1745.
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 'dmi.c')
| -rw-r--r-- | dmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -250,8 +250,8 @@ int dmi_fill(void) * - EFI's configuration table contains a pointer to the SMBIOS table. On linux it can be obtained from * sysfs. EFI's SMBIOS GUID is: {0xeb9d2d31,0x2d88,0x11d3,0x9a,0x16,0x0,0x90,0x27,0x3f,0xc1,0x4d} * - Scanning physical memory address range 0x000F0000h to 0x000FFFFF for the anchor-string(s). */ - dmi_mem = physmap_try_ro("DMI", 0xF0000, 0x10000); - if (dmi_mem == NULL) + dmi_mem = physmap_ro("DMI", 0xF0000, 0x10000); + if (dmi_mem == ERROR_PTR) return ret; for (fp = 0; fp <= 0xFFF0; fp += 16) { |