diff options
| author | Sudarshan Rajagopalan <sudaraja@codeaurora.org> | 2017-03-14 17:02:07 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-05 10:08:48 -0700 |
| commit | bac68423740ef9236f92513225bdf2e08e2c0190 (patch) | |
| tree | 13b0475f210dffbb3b49df45add93605c0f5a773 | |
| parent | 26db194916bdb891d9b2865d38cbe8068760d8ce (diff) | |
ion: change data type of source_vm* variable to int
The source_vm* variable is used to hold enum values of type
vmid{}, which has negative values (VMID_INVAL = -1). This variable
is declared as u32 in few functions. Change it to type int.
Change-Id: I4cc546e79a20a843d6bd096ab696913ab40dde6d
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
| -rw-r--r-- | drivers/staging/android/ion/ion_cma_heap.c | 2 | ||||
| -rw-r--r-- | drivers/staging/android/ion/ion_system_secure_heap.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c index b5905fc81147..dfb6d2f77af1 100644 --- a/drivers/staging/android/ion/ion_cma_heap.c +++ b/drivers/staging/android/ion/ion_cma_heap.c @@ -238,7 +238,7 @@ void ion_cma_heap_destroy(struct ion_heap *heap) static void ion_secure_cma_free(struct ion_buffer *buffer) { int ret = 0; - u32 source_vm; + int source_vm; int dest_vmid; int dest_perms; struct ion_cma_buffer_info *info = buffer->priv_virt; diff --git a/drivers/staging/android/ion/ion_system_secure_heap.c b/drivers/staging/android/ion/ion_system_secure_heap.c index ec09f9f12b47..803811597f37 100644 --- a/drivers/staging/android/ion/ion_system_secure_heap.c +++ b/drivers/staging/android/ion/ion_system_secure_heap.c @@ -1,6 +1,6 @@ /* * - * Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -78,7 +78,7 @@ int ion_system_secure_heap_unassign_sg(struct sg_table *sgt, int source_vmid) int ion_system_secure_heap_assign_sg(struct sg_table *sgt, int dest_vmid) { - u32 source_vmid = VMID_HLOS; + int source_vmid = VMID_HLOS; u32 dest_perms = PERM_READ | PERM_WRITE; struct scatterlist *sg; int ret, i; |