diff options
| author | Keith Packard <keithp@keithp.com> | 2010-06-10 19:18:53 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-06-10 19:18:53 -0700 |
| commit | 620ca54aaa0b363fcf68cec1bd6c37e68c988352 (patch) | |
| tree | bee8393dfa6d7837ea426db1f562cf059db843cb /hw | |
| parent | fd69234db004e98c663f5c6c4360d2cecaa8a4df (diff) | |
| parent | 8ff9b502cfce3828f7855ffba7949d6ebee34031 (diff) | |
Merge remote branch 'alanc/master'
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/int10/Makefile.am | 1 | ||||
| -rw-r--r-- | hw/xfree86/os-support/solaris/sun_agp.c | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am index 36d2ad0bb..f5ece69ef 100644 --- a/hw/xfree86/int10/Makefile.am +++ b/hw/xfree86/int10/Makefile.am @@ -5,6 +5,7 @@ sdk_HEADERS = xf86int10.h EXTRA_CFLAGS = libint10_la_LDFLAGS = -avoid-version +libint10_la_LIBADD = $(PCIACCESS_LIBS) COMMON_SOURCES = \ helper_exec.c \ diff --git a/hw/xfree86/os-support/solaris/sun_agp.c b/hw/xfree86/os-support/solaris/sun_agp.c index 734a6e1a6..9db5d6368 100644 --- a/hw/xfree86/os-support/solaris/sun_agp.c +++ b/hw/xfree86/os-support/solaris/sun_agp.c @@ -115,16 +115,16 @@ xf86GetAGPInfo(int screenNum) if (!GARTInit(screenNum)) return NULL; - if ((info = calloc(sizeof(AgpInfo), 1)) == NULL) { + if (ioctl(gartFd, AGPIOC_INFO, &agpinf) != 0) { xf86DrvMsg(screenNum, X_ERROR, - "xf86GetAGPInfo: Failed to allocate AgpInfo\n"); + "xf86GetAGPInfo: AGPIOC_INFO failed (%s)\n", + strerror(errno)); return NULL; } - if (ioctl(gartFd, AGPIOC_INFO, &agpinf) != 0) { + if ((info = calloc(sizeof(AgpInfo), 1)) == NULL) { xf86DrvMsg(screenNum, X_ERROR, - "xf86GetAGPInfo: AGPIOC_INFO failed (%s)\n", - strerror(errno)); + "xf86GetAGPInfo: Failed to allocate AgpInfo\n"); return NULL; } |