xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon.h |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit ab6e85d1f5dd4657591b314b85fd2453f99c3712
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Mar 22 10:51:05 2013 +0100

    glamor: Keep old private in radeon_pixmap_set_bo

diff --git a/src/radeon.h b/src/radeon.h
index 1cbeef6..8dc3d12 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -563,16 +563,20 @@ static inline void radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_bo *bo)
 	    if (priv->bo)
 		radeon_bo_unref(priv->bo);
 
-	    free(priv);
-	    priv = NULL;
+	    if (!bo) {
+		free(priv);
+		priv = NULL;
+	    }
 	}
 
 	if (bo) {
 	    uint32_t pitch;
 
-	    priv = calloc(1, sizeof (struct radeon_pixmap));
-	    if (priv == NULL)
-		goto out;
+	    if (!priv) {
+		priv = calloc(1, sizeof (struct radeon_pixmap));
+		if (!priv)
+		    goto out;
+	    }
 
 	    radeon_bo_ref(bo);
 	    priv->bo = bo;