summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/nvmap/nvmap_handle.c
diff options
context:
space:
mode:
authorSanjay Singh Rawat <srawat@nvidia.com>2012-06-18 23:21:41 +0530
committerSimone Willett <swillett@nvidia.com>2012-06-29 13:44:10 -0700
commit97128e9343ad2833e538a7aaecadc7fbcfc9521e (patch)
tree8a3c8c7a948bc55ac402455f201a8de28d4c7393 /drivers/video/tegra/nvmap/nvmap_handle.c
parentb3337813e973ca676681d22051a907162d4d51dd (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/nvmap_handle.c')
-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