summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-08-08 16:24:53 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-08-08 16:24:53 -0700
commit488414b6965d07843dc6183e1649519e9e7d3d53 (patch)
tree52239556c184c958b0db29b48746840a5840cbcf
parent0975f1e0b7cbdeddc8826840e9b2ab3e1de4832d (diff)
parent3171bf3ddf8d5223638e4dfcf1822b8f45e632f5 (diff)
Merge "ion: Correct argument of Set/ClearPagePrivate of secure CMA"
-rw-r--r--drivers/staging/android/ion/ion_cma_heap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c
index 62d2667ee2f6..d932db4f9810 100644
--- a/drivers/staging/android/ion/ion_cma_heap.c
+++ b/drivers/staging/android/ion/ion_cma_heap.c
@@ -262,7 +262,7 @@ static void ion_secure_cma_free(struct ion_buffer *buffer)
}
for_each_sg(sgt->sgl, sg, sgt->nents, i)
- ClearPagePrivate(sg_page(sgt->sgl));
+ ClearPagePrivate(sg_page(sg));
ion_cma_free(buffer);
}
@@ -308,7 +308,7 @@ static int ion_secure_cma_allocate(struct ion_heap *heap,
/* Set the private bit to indicate that we've secured this */
for_each_sg(sgt->sgl, sg, sgt->nents, i)
- SetPagePrivate(sg_page(sgt->sgl));
+ SetPagePrivate(sg_page(sg));
return ret;