forked from pool/xorg-x11-server
Egbert Eich
8d1dd68bbf
* int10: Fix error check for pci_device_map_legacy
pci_device_map_legacy returns 0 on success (bsc#932319).
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=569
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From: Jürg Billeter <j@bitron.ch>
|
|
Date: Sat Feb 7 18:13:21 2015 +0100
|
|
Subject: [PATCH]int10: Fix error check for pci_device_map_legacy
|
|
Patch-mainline: Upstream
|
|
Git-commit: 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56
|
|
Git-repo: git://anongit.freedesktop.org/git/xorg/xserver
|
|
References: bsc#932319
|
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
|
|
|
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);
|