xserver: Branch 'master'

[Dave Airlie]

 glx/glxext.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cb54cf1b3e8c4109541cfb698542c00f2473e731
Author: Dave Airlie <airlied at linux.ie>
Date:   Wed Sep 30 11:33:16 2009 +1000

    glx: fixup deref of null pointer when glx screen init fails.
    
    I think this is what the original author wanted.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>
    Acked-by: Ian Romanick <ian.d.romanick at intel.com>

diff --git a/glx/glxext.c b/glx/glxext.c
index 2de8b84..9f9c0ed 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -364,14 +364,14 @@ void GlxExtensionInit(void)
 
 	    glxScreen = p->screenProbe(pScreen);
 	    if (glxScreen != NULL) {
+	        if (glxScreen->GLXminor < glxMinorVersion)
+		    glxMinorVersion = glxScreen->GLXminor;
 		LogMessage(X_INFO,
 			   "GLX: Initialized %s GL provider for screen %d\n",
 			   p->name, i);
 		break;
 	    }
 
-	    if (glxScreen->GLXminor < glxMinorVersion)
-		glxMinorVersion = glxScreen->GLXminor;
 	}
 
 	if (!p)