rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

- U_int10-Fix-error-check-for-pci_device_map_legacy.patch

Browse Source 
* 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
This commit is contained in:
Egbert Eich 2015-05-30 04:40:56 +00:00 committed by Git OBS Bridge
parent b35b928f96
commit 8d1dd68bbf
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
U_int10-Fix-error-check-for-pci_device_map_legacy.patch Normal file
View File

@ -0,0 +1,45 @@
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);

7
xorg-x11-server.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat May 30 04:38:38 UTC 2015 - eich@suse.com
- U_int10-Fix-error-check-for-pci_device_map_legacy.patch
* int10: Fix error check for pci_device_map_legacy
pci_device_map_legacy returns 0 on success (bsc#932319).
-------------------------------------------------------------------
Fri Apr 17 08:14:31 UTC 2015 - normand@linux.vnet.ibm.com

4
xorg-x11-server.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package xorg-x11-server
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -167,6 +167,7 @@ Patch114: u_ad-hoc-fix-for-mmap-s-truncated-offset-parameter-on-.patch
Patch115: N_Force-swcursor-for-KMS-drivers-without-hw-cursor-sup.patch
Patch116: U_os-XDMCP-options-like-query-etc-should-imply-listen.patch
Patch117: xorg-x11-server-byte-order.patch
Patch118: U_int10-Fix-error-check-for-pci_device_map_legacy.patch
Patch1000: n_xserver-optimus-autoconfig-hack.patch
@ -259,6 +260,7 @@ cp %{SOURCE90} .
%patch115 -p1
%patch116 -p1
%patch117 -p1
%patch118 -p1
%patch1000 -p1