Magellan Linux

Contents of /trunk/xorg-server/patches/xorg-server-1.17.1-int10-fix-error-check-for-pci_device_map_legacy.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2576 - (show annotations) (download)
Mon Jun 15 13:02:17 2015 UTC (8 years, 10 months ago) by niro
File size: 1612 byte(s)
-fixed garbage patches
1 From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
3 Date: Sat, 7 Feb 2015 18:13:21 +0100
4 Subject: [PATCH] int10: Fix error check for pci_device_map_legacy
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 pci_device_map_legacy returns 0 on success.
10
11 Signed-off-by: Jürg Billeter <j@bitron.ch>
12 Reviewed-by: Adam Jackson <ajax@redhat.com>
13 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
14 ---
15 hw/xfree86/int10/generic.c | 2 +-
16 hw/xfree86/os-support/linux/int10/linux.c | 2 +-
17 2 files changed, 2 insertions(+), 2 deletions(-)
18
19 diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
20 index 012d194..8d5c4da 100644
21 --- a/hw/xfree86/int10/generic.c
22 +++ b/hw/xfree86/int10/generic.c
23 @@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int len)
24 {
25 void *map;
26
27 - if (!pci_device_map_legacy(dev, 0, len, 0, &map))
28 + if (pci_device_map_legacy(dev, 0, len, 0, &map))
29 return FALSE;
30
31 memcpy(buf, map, len);
32 diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
33 index 79b9a88..6ca118f 100644
34 --- a/hw/xfree86/os-support/linux/int10/linux.c
35 +++ b/hw/xfree86/os-support/linux/int10/linux.c
36 @@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsigned char *buf, int base, int len)
37 {
38 void *map;
39
40 - if (!pci_device_map_legacy(dev, base, len, 0, &map))
41 + if (pci_device_map_legacy(dev, base, len, 0, &map))
42 return FALSE;
43
44 memcpy(buf, map, len);
45 --
46 2.3.2
47