diff --git a/cros_gralloc/cros_gralloc_buffer.cc b/cros_gralloc/cros_gralloc_buffer.cc
index cec68a5..710b78f 100644
--- a/cros_gralloc/cros_gralloc_buffer.cc
+++ b/cros_gralloc/cros_gralloc_buffer.cc
@@ -87,12 +87,9 @@
 		return -EINVAL;
 	}
 
-	if (!--lockcount_) {
-		if (lock_data_[0]) {
-			drv_bo_unmap(bo_, lock_data_[0]);
-			lock_data_[0] = nullptr;
-		}
-	}
+	--lockcount_;
+	if (lock_data_[0])
+		return drv_bo_flush(bo_, lock_data_[0]);
 
 	return 0;
 }
diff --git a/gbm.c b/gbm.c
index 58173ea..831dfbf 100644
--- a/gbm.c
+++ b/gbm.c
@@ -242,7 +242,7 @@
 PUBLIC void gbm_bo_unmap(struct gbm_bo *bo, void *map_data)
 {
 	assert(bo);
-	drv_bo_unmap(bo->bo, map_data);
+	drv_bo_flush(bo->bo, map_data);
 }
 
 PUBLIC uint32_t gbm_bo_get_width(struct gbm_bo *bo)