summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/nvmap
diff options
context:
space:
mode:
authorSanjay Singh Rawat <srawat@nvidia.com>2012-06-18 23:21:41 +0530
committerVarun Wadekar <vwadekar@nvidia.com>2012-07-12 10:12:15 +0530
commit3ebe1fab8801b146a534844bcfc4f87b2e160958 (patch)
treeab01cd1e36c350df585d883edaa58d1eec4227fd /drivers/video/tegra/nvmap
parentbab9e4e28567d924b517dae8c263e6c0f3d09edd (diff)
video: tegra: nvmap: resolve compilation time warning
- Grouping variables around bitwise operators for safe operation. bug 949219 Change-Id: I8edf7fb241eb79ac07b63ab856d206fc453308f1 Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com> Reviewed-on: http://git-master/r/109577 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/nvmap')
-rw-r--r--drivers/video/tegra/nvmap/nvmap_handle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap_handle.c b/drivers/video/tegra/nvmap/nvmap_handle.c
index 0cdac926f041..05046ed8ba79 100644
--- a/drivers/video/tegra/nvmap/nvmap_handle.c
+++ b/drivers/video/tegra/nvmap/nvmap_handle.c
@@ -748,7 +748,7 @@ int nvmap_alloc_handle_id(struct nvmap_client *client,
#ifndef CONFIG_TEGRA_IOVMM
/* convert iovmm requests to generic carveout. */
if (heap_mask & NVMAP_HEAP_IOVMM) {
- heap_mask = heap_mask & ~NVMAP_HEAP_IOVMM |
+ heap_mask = (heap_mask & ~NVMAP_HEAP_IOVMM) |
NVMAP_HEAP_CARVEOUT_GENERIC;
}
#endif