From 97128e9343ad2833e538a7aaecadc7fbcfc9521e Mon Sep 17 00:00:00 2001 From: Sanjay Singh Rawat Date: Mon, 18 Jun 2012 23:21:41 +0530 Subject: 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 Reviewed-on: http://git-master/r/109577 Reviewed-by: Simone Willett Tested-by: Simone Willett --- drivers/video/tegra/nvmap/nvmap_handle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3