Module: Mesa Branch: master Commit: 0b4c529da5c67f9719f4ca92cbeca4fcf826796f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0b4c529da5c67f9719f4ca92cbeca4fcf826796f
Author: Tilman Sauerbeck <[email protected]> Date: Thu Sep 9 15:24:50 2010 +0200 r600g: Only increase a bo's map_count if radeon_bo_map() succeeded. Signed-off-by: Tilman Sauerbeck <[email protected]> --- src/gallium/winsys/r600/drm/radeon_bo.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gallium/winsys/r600/drm/radeon_bo.c b/src/gallium/winsys/r600/drm/radeon_bo.c index a1306f6..f79135b 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; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
