Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3043863 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: Use correct heap when freeing secure system heap buffers"

parents 12db9c0b 76723404

drivers/staging/android/ion/ion_system_secure_heap.c

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ static void ion_system_secure_heap_free(struct ion_buffer *buffer) 
	struct ion_system_secure_heap *secure_heap =

		to_system_secure_heap(heap);



	buffer->heap = secure_heap->sys_heap;

	secure_heap->sys_heap->ops->free(buffer);

}

drivers/staging/android/ion/msm_ion_dma_buf.c

+0 −1
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ static void ion_dma_buf_release(struct dma_buf *dmabuf) 
	struct ion_buffer *buffer = dmabuf->priv;



	_ion_buffer_destroy(buffer);

	kfree(dmabuf->exp_name);

}



static void *ion_dma_buf_vmap(struct dma_buf *dmabuf)