From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu, 9 Sep 2010 13:24:50 +0000 (+0200)
Subject: r600g: Only increase a bo's map_count if radeon_bo_map() succeeded.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0b4c529da5c67f9719f4ca92cbeca4fcf826796f;p=mesa.git

r600g: Only increase a bo's map_count if radeon_bo_map() succeeded.

Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
---

diff --git a/src/gallium/winsys/r600/drm/radeon_bo.c b/src/gallium/winsys/r600/drm/radeon_bo.c
index a1306f6e9d2..f79135bfa16 100644
--- a/src/gallium/winsys/r600/drm/radeon_bo.c
+++ b/src/gallium/winsys/r600/drm/radeon_bo.c
@@ -96,8 +96,8 @@ int radeon_bo_map(struct radeon *radeon, struct radeon_bo *bo)
 	void *ptr;
 	int r;
 
-	if (bo->map_count++ != 0) {
-		return 0;
+	if (bo->map_count != 0) {
+		goto success;
 	}
 	/* Zero out args to make valgrind happy */
 	memset(&args, 0, sizeof(args));
@@ -117,6 +117,10 @@ int radeon_bo_map(struct radeon *radeon, struct radeon_bo *bo)
 		return -errno;
 	}
 	bo->data = ptr;
+
+success:
+	bo->map_count++;
+
 	return 0;
 }