drm/nouveau/clk/gk20a: properly protect macro argument

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

drm/nouveau/clk/gk20a: properly protect macro argument
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
9772605c · Alexandre Courbot · Ben Skeggs · 791eeea2 · 9772605c · 9772605c
Commit 9772605c authored Jun 01, 2016 by Alexandre Courbot Committed by Ben Skeggs Jul 14, 2016
Showing with 2 additions and 2 deletions

drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c +1 -1

drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c +1 -1

No files found.
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c
+++ b/drivers/gpu/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)

--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c
+++ b/drivers/gpu/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