xf86-video-ati: Branch 'master'

[Michel Daenzer]

 src/radeon_driver.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree ac9cbaf32176cf144bc694ac879e7c9e2920f762 (from 5b5b90c2cea7e36895354f5872acd3fc769653f9)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Mon Jul 2 10:06:02 2007 +0200

    radeon: Fully zero-initialize info->CRT2pScrn->monitor.
    
    This prevents modes from getting rejected due to the uninitialized maxPixClock
    value.
    
    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=9816 .

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 4e1868d..5c20b0e 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -7323,7 +7323,7 @@ RADEONGetMergedFBOptions(ScrnInfoPtr pSc
 
     if(info->MergedFB) {
           /* fill in monitor */
-       info->CRT2pScrn->monitor = xalloc(sizeof(MonRec));
+       info->CRT2pScrn->monitor = xcalloc(1, sizeof(MonRec));
        if(info->CRT2pScrn->monitor) {
           DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL;
           memcpy(info->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec));