[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, master, updated. upstream/0.0.0+20090707.git98c012f7-57-g9918e08

[Thomas White]

The following commit has been merged in the master branch:
commit f9ad3d94703932c94182d5eac15c887e54133857
Author: Thomas White <taw at bitwiz.org.uk>
Date:   Mon Oct 19 10:26:12 2009 +0200

    Fix use of uninitialised 'pScrn'

diff --git a/src/glamo-driver.c b/src/glamo-driver.c
index e8d39f6..17b661e 100644
--- a/src/glamo-driver.c
+++ b/src/glamo-driver.c
@@ -298,6 +298,8 @@ GlamoFbdevProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections)
 			if (pScrn) {
 
 				foundScreen = TRUE;
+				xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+				           "Not using KMS\n");
 
 				pScrn->driverVersion = GLAMO_VERSION;
 				pScrn->driverName    = GLAMO_DRIVER_NAME;
@@ -345,6 +347,7 @@ GlamoKMSProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections)
 		if ( pScrn ) {
 
 			foundScreen = TRUE;
+			xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using KMS!\n");
 
 			/* Plug in KMS functions */
 			pScrn->driverVersion = GLAMO_VERSION;
@@ -367,7 +370,6 @@ GlamoKMSProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections)
 static Bool
 GlamoProbe(DriverPtr drv, int flags)
 {
-	ScrnInfoPtr pScrn;
 	GDevPtr *devSections;
 	int numDevSections;
 	Bool foundScreen = FALSE;
@@ -384,10 +386,8 @@ GlamoProbe(DriverPtr drv, int flags)
 	/* Is today a good day to use KMS? */
 	if ( GlamoKernelModesettingAvailable() ) {
 		foundScreen = GlamoKMSProbe(drv, devSections, numDevSections);
-		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using KMS!\n");
 	} else {
 		foundScreen = GlamoFbdevProbe(drv, devSections, numDevSections);
-		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Not using KMS\n");
 	}
 
 	xfree(devSections);

-- 
xf86-video-glamo, SMedia Glamo video driver for X.Org