From aea801cf9a5ce519a53d6fffd9a3a2e526ec79ea Mon Sep 17 00:00:00 2001
From: Matthias Hopf <mhopf@suse.de>
Date: Fri, 13 Apr 2007 16:16:05 +0200
Subject: 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.
---
 src/radeon_driver.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index c4bda8a3..0f9e2d61 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2328,7 +2328,11 @@ static Bool RADEONPreInitModes(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10)
 		
 	    }
 	}
+	else
+	    info->MergedFB = FALSE;
     }
+    else
+	info->MergedFB = FALSE;
 
     if (info->MergedFB) {
        /* If no virtual dimension was given by the user,
-- 
cgit v1.2.3