xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
diff-tree fca30a6b581cb6c1466ab1bc316df8fed5d82b60 (from 97d8d1ed10d069343f2b3172ba64ca421821a602)
Author: Alex Deucher <alex at botch2.com>
Date:   Mon Mar 26 23:26:51 2007 -0400

    fix NULL dereference
    
    when IsSecondary is true, crtc1 is NULL
    Noticed by Sverre Froyen.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 28580a5..1bd6884 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -6328,7 +6328,7 @@ static Bool RADEONInit2(ScrnInfoPtr pScr
 {
     RADEONInfoPtr  info      = RADEONPTR(pScrn);
     RADEONEntPtr pRADEONEnt  = RADEONEntPriv(pScrn);
-    double         dot_clock = crtc1->Clock/1000.0;
+    double         dot_clock;
     RADEONInfoPtr  info0     = NULL;
     ScrnInfoPtr    pScrn0    = NULL;
 
@@ -6358,7 +6358,7 @@ static Bool RADEONInit2(ScrnInfoPtr pScr
     ErrorF("\n");
     ErrorF("%-12.12s %7.2f  %4d %4d %4d %4d  %4d %4d %4d %4d (%d,%d)",
 	   crtc1->name,
-	   dot_clock,
+	   crtc1->Clock/1000.0,
 
 	   crtc1->CrtcHDisplay,
 	   crtc1->CrtcHSyncStart,