Merge upstream version 0.3.4.

(cherry picked from commit 21eb1c8d6fefa5dcd3a9a800b4add06d5c30c01f)

1 files changed, 3 insertions, 7 deletions

diff --git a/src/pirq.c b/src/pirq.c
index a342ac3..bf2ef2a 100644
--- a/src/pirq.c
+++ b/src/pirq.c
@@ -50,16 +50,11 @@ struct routing_table * pirq_alloc_read_table()
 	int fd=open("/dev/mem", O_RDONLY);
 
 	if(fd==-1)
-	{
-		perror("open(/dev/mem)");
 		return NULL;
-	}
 
 	mem = mmap(0, 64*1024, PROT_READ, MAP_SHARED, fd, 0xF0000L);
-	if (!mem) {
-		perror("mmap(/dev/mem)");
+	if (mem == (void *)-1LL)
 		goto out;
-	}
 
 	while( offset < 0xFFFF)
 	{
@@ -94,7 +89,8 @@ out:
 
 void pirq_free_table(struct routing_table *table)
 {
-	free(table);
+	if (table)
+		free(table);
 }