From d1ab1cbde22232a68cf6ddf105ad58d8935dc0fc Mon Sep 17 00:00:00 2001 From: Cho KyongHo Date: Tue, 3 Apr 2018 23:12:17 +0900 Subject: [PATCH] [COMMON] ion: fix conflicts Change-Id: I250c65be08f436f8cef3fc00674587a74886ea61 Signed-off-by: Cho KyongHo --- drivers/staging/android/ion/ion_cma_heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c index 2e0442fa3653..ffb1c9e65274 100644 --- a/drivers/staging/android/ion/ion_cma_heap.c +++ b/drivers/staging/android/ion/ion_cma_heap.c @@ -125,9 +125,9 @@ err: static void ion_cma_free(struct ion_buffer *buffer) { struct ion_cma_heap *cma_heap = to_cma_heap(buffer->heap); - unsigned long nr_pages = PAGE_ALIGN(buffer->size) >> PAGE_SHIFT; bool protected = cma_heap->secure && (buffer->flags & ION_FLAG_PROTECTED); + unsigned long nr_pages = PAGE_ALIGN(buffer->size) >> PAGE_SHIFT; if (protected) ion_buffer_unprotect(buffer->priv_virt); -- 2.20.1