xf86-video-ati: Branch 'master'

[Matthias Hopf]

 src/radeon_driver.c |    4 ++++
 1 files changed, 4 insertions(+)

New commits:
diff-tree aea801cf9a5ce519a53d6fffd9a3a2e526ec79ea (from 07ddffb32e6293c77b32c94b87ec468caef3d6f5)
Author: Matthias Hopf <mhopf at suse.de>
Date:   Fri Apr 13 16:16:05 2007 +0200

    Fix crash if MergedFB and secondary head not found
    
    If the secondary head isn't found (Monitor unplugged etc.) but MergedFB
    is configured, the driver segfaults because it tries to access the mode
    list private structures, which are not filled in.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index c4bda8a..0f9e2d6 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2328,7 +2328,11 @@ static Bool RADEONPreInitModes(ScrnInfoP
 		
 	    }
 	}
+	else
+	    info->MergedFB = FALSE;
     }
+    else
+	info->MergedFB = FALSE;
 
     if (info->MergedFB) {
        /* If no virtual dimension was given by the user,