Fri Jan 21 09:48:29 2011 UTC ()

dont negate error value passed to strerror
the linux libpciaccess returns negated value, but no other os does...


(ahoka)

diff -r1.1.1.2 -r1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.c

--- xsrc/external/mit/xf86-video-intel/dist/src/Attic/i830_bios.c 2009/06/09 02:54:33	1.1.1.2
+++ xsrc/external/mit/xf86-video-intel/dist/src/Attic/i830_bios.c 2011/01/21 09:48:29	1.2

 @@ -228,27 +228,27 @@ i830_bios_init(ScrnInfoPtr pScrn)
+    }
 #else
     size = INTEL_VBIOS_SIZE;
 #endif
     bios = xalloc(size);
     if (bios == NULL)
 	return -1;
 #if XSERVER_LIBPCIACCESS
     ret = pci_device_read_rom (pI830->PciInfo, bios);
     if (ret != 0) {
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
                   "libpciaccess failed to read %dkB video BIOS: %s\n",
-                  size / 1024, strerror(-ret));
+                  size / 1024, strerror(ret));
 	xfree (bios);
 	return -1;
+    }
 #else
     /* xf86ReadPciBIOS returns the length read */
     ret = xf86ReadPciBIOS(0, pI830->PciTag, 0, bios, size);
     if (ret <= 0) {
 	xfree (bios);
 	return -1;
+    }
 #endif
     vbt_off = INTEL_BIOS_16(0x1a);