From 83e96fdcf51f87c1a0003995d9fc9fb3ebbf951c Mon Sep 17 00:00:00 2001 From: Mika Kuoppala Date: Tue, 11 Aug 2015 15:44:31 +0100 Subject: [PATCH 1/2] drm/i915: Contain the WA_REG macro Prevent leaking the if scoping by containing the WA_REG macro inside its own scope. Reported-by: Arun Siluvery Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 1a10358..2f1f4f7 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -780,11 +780,11 @@ static int wa_add(struct drm_i915_private *dev_priv, return 0; } -#define WA_REG(addr, mask, val) { \ +#define WA_REG(addr, mask, val) do { \ const int r = wa_add(dev_priv, (addr), (mask), (val)); \ if (r) \ return r; \ - } + } while(0) #define WA_SET_BIT_MASKED(addr, mask) \ WA_REG(addr, (mask), _MASKED_BIT_ENABLE(mask)) -- 2.1.4