xserver: Branch 'master'

[Maarten Maathuis]

 hw/xfree86/modes/xf86Crtc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 881bd15f445bb62c3fdea863c968c95217408b6e
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Sun Aug 31 18:07:22 2008 +0200

    xf86Crtc: Set mode to NULL, so nothing bad happens if crtc == NULL.
    
    - Fix is courtesy of math_b.

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 21e7dd2..ed2ae7a 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1746,7 +1746,7 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn)
     xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
     xf86OutputPtr	output;
     xf86CrtcPtr		crtc;
-    DisplayModePtr	last, mode;
+    DisplayModePtr	last, mode = NULL;
 
     output = SetCompatOutput(config);