diff --git a/drivers/staging/android/ion/heaps/ion_carveout_heap.c b/drivers/staging/android/ion/heaps/ion_carveout_heap.c
index aa3b24e48421..8e4aedcc0a09 100644
--- a/drivers/staging/android/ion/heaps/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/heaps/ion_carveout_heap.c
@@ -200,6 +200,7 @@ __ion_carveout_heap_create(struct ion_platform_heap *heap_data,
 	gen_pool_add(carveout_heap->pool, carveout_heap->base, heap_data->size,
 		     -1);
 	carveout_heap->heap.ion_heap.ops = &carveout_heap_ops;
+	carveout_heap->heap.ion_heap.buf_ops = msm_ion_dma_buf_ops;
 	carveout_heap->heap.ion_heap.type = ION_HEAP_TYPE_CARVEOUT;
 	carveout_heap->heap.ion_heap.flags = ION_HEAP_FLAG_DEFER_FREE;
 
@@ -395,6 +396,7 @@ ion_secure_carveout_heap_create(struct ion_platform_heap *heap_data)
 	}
 
 	manager->heap.ion_heap.ops = &ion_sc_heap_ops;
+	manager->heap.ion_heap.buf_ops = msm_ion_dma_buf_ops;
 	manager->heap.ion_heap.type =
 		(enum ion_heap_type)ION_HEAP_TYPE_SECURE_CARVEOUT;
 	return &manager->heap.ion_heap;
diff --git a/drivers/staging/android/ion/heaps/ion_cma_heap.c b/drivers/staging/android/ion/heaps/ion_cma_heap.c
index 8bf91574f0b6..b91320c4212c 100644
--- a/drivers/staging/android/ion/heaps/ion_cma_heap.c
+++ b/drivers/staging/android/ion/heaps/ion_cma_heap.c
@@ -127,6 +127,7 @@ struct ion_heap *ion_cma_heap_create(struct ion_platform_heap *data)
 		return ERR_PTR(-ENOMEM);
 
 	cma_heap->heap.ion_heap.ops = &ion_cma_ops;
+	cma_heap->heap.ion_heap.buf_ops = msm_ion_dma_buf_ops;
 	/*
 	 * get device from private heaps data, later it will be
 	 * used to make the link with reserved CMA memory
@@ -199,6 +200,7 @@ struct ion_heap *ion_cma_secure_heap_create(struct ion_platform_heap *data)
 		return ERR_PTR(-ENOMEM);
 
 	cma_heap->heap.ion_heap.ops = &ion_secure_cma_ops;
+	cma_heap->heap.ion_heap.buf_ops = msm_ion_dma_buf_ops;
 	/*
 	 * get device from private heaps data, later it will be
 	 * used to make the link with reserved CMA memory
diff --git a/drivers/staging/android/ion/heaps/ion_system_heap.c b/drivers/staging/android/ion/heaps/ion_system_heap.c
index dc3093845e86..4504911251fc 100644
--- a/drivers/staging/android/ion/heaps/ion_system_heap.c
+++ b/drivers/staging/android/ion/heaps/ion_system_heap.c
@@ -720,6 +720,7 @@ struct ion_heap *ion_system_heap_create(struct ion_platform_heap *data)
 		return ERR_PTR(-ENOMEM);
 	heap->heap.dev = data->priv;
 	heap->heap.ion_heap.ops = &system_heap_ops;
+	heap->heap.ion_heap.buf_ops = msm_ion_dma_buf_ops;
 	heap->heap.ion_heap.type = ION_HEAP_TYPE_SYSTEM;
 	heap->heap.ion_heap.flags = ION_HEAP_FLAG_DEFER_FREE;
 
diff --git a/drivers/staging/android/ion/heaps/ion_system_secure_heap.c b/drivers/staging/android/ion/heaps/ion_system_secure_heap.c
index 1ecc903b8ce0..a75f1bb01f32 100644
--- a/drivers/staging/android/ion/heaps/ion_system_secure_heap.c
+++ b/drivers/staging/android/ion/heaps/ion_system_secure_heap.c
@@ -334,6 +334,7 @@ struct ion_heap *ion_system_secure_heap_create(struct ion_platform_heap *unused)
 	if (!heap)
 		return ERR_PTR(-ENOMEM);
 	heap->heap.ion_heap.ops = &system_secure_heap_ops;
+	heap->heap.ion_heap.buf_ops = msm_ion_dma_buf_ops;
 	heap->heap.ion_heap.type =
 		(enum ion_heap_type)ION_HEAP_TYPE_SYSTEM_SECURE;
 	heap->sys_heap = sys_heap;