From c1828a8ff51c8db326c47e6710f4f42fab94fb6d Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 3 Nov 2006 18:32:48 +0100 Subject: [PATCH] Fixing mach64 driver bailing out on ia64 Mach64 driver bails out on ia64 because it cannot map device memory. It turns out that some bogus and unneeded code attempts to find the root bridge of the device and fails to do so proberly as there this host-to-pci bridge is not existant. This code has been around for years although it completely unclear what it had been intended for. Fixing this by eliminating the bogus code. --- hw/xfree86/os-support/bus/linuxPci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index 97d60f599..afb38197f 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -570,9 +570,7 @@ linuxMapPci(int ScreenNum, int Flags, PCITAG Tag, xf86InitVidMem(); - pPCI = xf86GetPciHostConfigFromTag(Tag); - - if (((fd = linuxPciOpenFile(pPCI ? pPCI->tag : 0,FALSE)) < 0) || + if (((fd = linuxPciOpenFile(Tag ,FALSE)) < 0) || (ioctl(fd, mmap_ioctl, 0) < 0)) break;