diff options
Diffstat (limited to 'drivers/media/platform/msm/camera/cam_req_mgr/cam_mem_mgr.c')
| -rw-r--r-- | drivers/media/platform/msm/camera/cam_req_mgr/cam_mem_mgr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/platform/msm/camera/cam_req_mgr/cam_mem_mgr.c b/drivers/media/platform/msm/camera/cam_req_mgr/cam_mem_mgr.c index 0e77a4c01fb4..f2c243e8c7a9 100644 --- a/drivers/media/platform/msm/camera/cam_req_mgr/cam_mem_mgr.c +++ b/drivers/media/platform/msm/camera/cam_req_mgr/cam_mem_mgr.c @@ -25,11 +25,11 @@ static struct cam_mem_table tbl; static int cam_mem_util_map_cpu_va(struct ion_handle *hdl, - uint64_t *vaddr, + uintptr_t *vaddr, size_t *len) { *vaddr = (uintptr_t)ion_map_kernel(tbl.client, hdl); - if (IS_ERR_OR_NULL((void *)*vaddr)) { + if (IS_ERR_OR_NULL((void *)(uintptr_t)(*vaddr))) { CAM_ERR(CAM_MEM, "kernel map fail"); return -ENOSPC; } @@ -183,12 +183,12 @@ handle_mismatch: } EXPORT_SYMBOL(cam_mem_get_io_buf); -int cam_mem_get_cpu_buf(int32_t buf_handle, uint64_t *vaddr_ptr, size_t *len) +int cam_mem_get_cpu_buf(int32_t buf_handle, uintptr_t *vaddr_ptr, size_t *len) { int rc = 0; int idx; struct ion_handle *ion_hdl = NULL; - uint64_t kvaddr = 0; + uintptr_t kvaddr = 0; size_t klen = 0; if (!buf_handle || !vaddr_ptr || !len) @@ -288,7 +288,7 @@ int cam_mem_mgr_cache_ops(struct cam_mem_cache_ops_cmd *cmd) rc = msm_ion_do_cache_op(tbl.client, tbl.bufq[idx].i_hdl, - (void *)tbl.bufq[idx].vaddr, + (void *)(uintptr_t)tbl.bufq[idx].vaddr, tbl.bufq[idx].len, ion_cache_ops); if (rc) @@ -926,7 +926,7 @@ int cam_mem_mgr_request_mem(struct cam_mem_mgr_request_desc *inp, int rc = 0; uint32_t heap_id; int32_t ion_flag = 0; - uint64_t kvaddr; + uintptr_t kvaddr; dma_addr_t iova = 0; size_t request_len = 0; uint32_t mem_handle; |