xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_crtc.c  |    4 +++-
 src/radeon_video.c |    1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 38aa450fce6a91b35c191fd07112490a62cc29c6
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Aug 26 21:50:23 2008 -0400

    fix some fallout from the common allocator
    
    should fix bug 17317

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index 69a87a4..99992fc 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -465,8 +465,10 @@ radeon_crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data
     if (rotate_pixmap)
 	FreeScratchPixmapHeader(rotate_pixmap);
 
-    if (data)
+    if (data) {
 	radeon_free_memory(pScrn, radeon_crtc->crtc_rotate_mem);
+	radeon_crtc->crtc_rotate_mem = NULL;
+    }
 
 }
 
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 598bf2b..18299d5 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -3228,6 +3228,7 @@ RADEONFreeSurface(
     if(pPriv->isOn)
 	RADEONStopSurface(surface);
     radeon_free_memory(pScrn, pPriv->surface_memory);
+    pPriv->surface_memory = NULL;
     xfree(surface->pitches);
     xfree(surface->offsets);
     xfree(surface->devPrivate.ptr);