[Nouveau] [PATCH 06/15] clk/gk20a: properly protect macro argument
Alexandre Courbot
acourbot at nvidia.com
Wed Jun 1 08:39:20 UTC 2016
Signed-off-by: Alexandre Courbot <acourbot at nvidia.com>
---
drm/nouveau/nvkm/subdev/clk/gk20a.c | 2 +-
drm/nouveau/nvkm/subdev/clk/gm20b.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drm/nouveau/nvkm/subdev/clk/gk20a.c b/drm/nouveau/nvkm/subdev/clk/gk20a.c
index 5f0ee24e31b8..d633669b52dc 100644
--- a/drm/nouveau/nvkm/subdev/clk/gk20a.c
+++ b/drm/nouveau/nvkm/subdev/clk/gk20a.c
@@ -31,7 +31,7 @@
#define KHZ (1000)
#define MHZ (KHZ * 1000)
-#define MASK(w) ((1 << w) - 1)
+#define MASK(w) ((1 << (w)) - 1)
#define GPCPLL_CFG (SYS_GPCPLL_CFG_BASE + 0)
#define GPCPLL_CFG_ENABLE BIT(0)
diff --git a/drm/nouveau/nvkm/subdev/clk/gm20b.c b/drm/nouveau/nvkm/subdev/clk/gm20b.c
index 71b2bbb61973..274a74c14fe7 100644
--- a/drm/nouveau/nvkm/subdev/clk/gm20b.c
+++ b/drm/nouveau/nvkm/subdev/clk/gm20b.c
@@ -29,7 +29,7 @@
#define KHZ (1000)
#define MHZ (KHZ * 1000)
-#define MASK(w) ((1 << w) - 1)
+#define MASK(w) ((1 << (w)) - 1)
#define BYPASSCTRL_SYS (SYS_GPCPLL_CFG_BASE + 0x340)
#define BYPASSCTRL_SYS_GPCPLL_SHIFT 0
--
2.8.3
More information about the Nouveau
mailing list