diff options
| -rw-r--r-- | flashrom.8.tmpl | 3 | ||||
| -rw-r--r-- | physmap.c | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl index 5ede423..9f8af03 100644 --- a/flashrom.8.tmpl +++ b/flashrom.8.tmpl @@ -857,8 +857,7 @@ backuplog.txt, writelog.txt and restorelog.txt. See section .B BUGS for contact info. .SH EXIT STATUS -flashrom exits with 0 on success, 1 on most failures but with 2 if /dev/mem -(/dev/xsvc on Solaris) can not be opened and with 3 if a call to mmap() fails. +flashrom exits with 0 on success, 1 on most failures but with 3 if a call to mmap() fails. .SH REQUIREMENTS flashrom needs different access permissions for different programmers. .sp @@ -165,12 +165,11 @@ static void *sys_physmap_rw_uncached(uintptr_t phys_addr, size_t len) /* Open the memory device UNCACHED. Important for MMIO. */ if (-1 == (fd_mem = open(MEM_DEV, O_RDWR | O_SYNC))) { msg_perr("Critical error: open(" MEM_DEV "): %s\n", strerror(errno)); - exit(2); + return ERROR_PTR; } } - virt_addr = mmap(NULL, len, PROT_WRITE | PROT_READ, MAP_SHARED, - fd_mem, (off_t)phys_addr); + virt_addr = mmap(NULL, len, PROT_WRITE | PROT_READ, MAP_SHARED, fd_mem, (off_t)phys_addr); return MAP_FAILED == virt_addr ? ERROR_PTR : virt_addr; } @@ -185,12 +184,11 @@ static void *sys_physmap_ro_cached(uintptr_t phys_addr, size_t len) /* Open the memory device CACHED. */ if (-1 == (fd_mem_cached = open(MEM_DEV, O_RDWR))) { msg_perr("Critical error: open(" MEM_DEV "): %s\n", strerror(errno)); - exit(2); + return ERROR_PTR; } } - virt_addr = mmap(NULL, len, PROT_READ, MAP_SHARED, - fd_mem_cached, (off_t)phys_addr); + virt_addr = mmap(NULL, len, PROT_READ, MAP_SHARED, fd_mem_cached, (off_t)phys_addr); return MAP_FAILED == virt_addr ? ERROR_PTR : virt_addr; } @@ -200,7 +198,7 @@ void physunmap(void *virt_addr, size_t len) msg_pspew("Not unmapping zero size at %p\n", virt_addr); return; } - + munmap(virt_addr, len); } #endif |
