libswitchhw: fix error detaction on device open

open returns -1 on error, not 0 mmap returns -1 on error, not NULL Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

libswitchhw: fix error detaction on device open
open returns -1 on error, not 0 mmap returns -1 on error, not NULL Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
47cd4920 · Alessandro Rubini · 02a7c84a · 47cd4920
Commit 47cd4920 authored Jun 12, 2014 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

fpga_io.c userspace/libswitchhw/fpga_io.c +10 -8

No files found.
--- a/userspace/libswitchhw/fpga_io.c
+++ b/userspace/libswitchhw/fpga_io.c
@@ -27,15 +27,17 @@ int shw_fpga_mmap_init()
    TRACE(TRACE_INFO, "Initializing FPGA memory mapping.");
    fd = open("/dev/mem", O_RDWR | O_SYNC);
-  if(!fd) return -1;
+    if (fd < 0) {
-  _fpga_base_virt = mmap(NULL, SMC_CS0_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, SMC_CS0_BASE);
+	    perror("/dev/mem");
+	    return -1;
-  if(_fpga_base_virt == NULL)
+    }
-  {
+    _fpga_base_virt = mmap(NULL, SMC_CS0_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, SMC_CS0_BASE);
-    perror("mmap()");
    close(fd);
-    return -1;
-  }
+    if(_fpga_base_virt == MAP_FAILED) {
+	    perror("mmap()");
+	    return -1;
+    }
    TRACE(TRACE_INFO, "FPGA virtual base = 0x%08x", _fpga_base_virt);