From 4c61bf84b11e26e6f22648668c95ea760a379163 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 11 Jun 2010 12:14:52 +0000 Subject: xserver git update 11/6/2010 --- xorg-server/hw/xfree86/common/xf86AutoConfig.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xorg-server/hw/xfree86/common/xf86AutoConfig.c') diff --git a/xorg-server/hw/xfree86/common/xf86AutoConfig.c b/xorg-server/hw/xfree86/common/xf86AutoConfig.c index 9f6348681..a00340191 100644 --- a/xorg-server/hw/xfree86/common/xf86AutoConfig.c +++ b/xorg-server/hw/xfree86/common/xf86AutoConfig.c @@ -120,8 +120,7 @@ FreeList(const char ***list, int *lines) int i; for (i = 0; i < *lines; i++) { - if ((*list)[i]) - free((*list)[i]); + free((*list)[i]); } free(*list); *list = NULL; @@ -186,7 +185,7 @@ xf86AutoConfig(void) if (ret != CONFIG_OK) xf86Msg(X_ERROR, "Error parsing the built-in default configuration.\n"); - return (ret == CONFIG_OK); + return ret == CONFIG_OK; } static void @@ -257,7 +256,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches) } #endif - xf86PciMatchDriver(matches, nmatches); + i = xf86PciMatchDriver(matches, nmatches); /* Fallback to platform default hardware */ if (i < (nmatches - 1)) { -- cgit v1.2.3