Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

1 files changed, 47 insertions, 0 deletions

diff --git a/libre/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch b/libre/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
new file mode 100644
index 000000000..75e5bb92f
--- /dev/null
+++ b/libre/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
@@ -0,0 +1,47 @@
+From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
+Date: Sat, 7 Feb 2015 18:13:21 +0100
+Subject: [PATCH] int10: Fix error check for pci_device_map_legacy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+pci_device_map_legacy returns 0 on success.
+
+Signed-off-by: Jürg Billeter <j@bitron.ch>
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ hw/xfree86/int10/generic.c                | 2 +-
+ hw/xfree86/os-support/linux/int10/linux.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
+index 012d194..8d5c4da 100644
+--- a/hw/xfree86/int10/generic.c
++++ b/hw/xfree86/int10/generic.c
+@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int len)
+ {
+     void *map;
+ 
+-    if (!pci_device_map_legacy(dev, 0, len, 0, &map))
++    if (pci_device_map_legacy(dev, 0, len, 0, &map))
+         return FALSE;
+ 
+     memcpy(buf, map, len);
+diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
+index 79b9a88..6ca118f 100644
+--- a/hw/xfree86/os-support/linux/int10/linux.c
++++ b/hw/xfree86/os-support/linux/int10/linux.c
+@@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsigned char *buf, int base, int len)
+ {
+     void *map;
+ 
+-    if (!pci_device_map_legacy(dev, base, len, 0, &map))
++    if (pci_device_map_legacy(dev, base, len, 0, &map))
+         return FALSE;
+ 
+     memcpy(buf, map, len);
+-- 
+2.3.2
+