Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca5a0fbd authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Daniel Vetter
Browse files

drm/i915: Contain the WA_REG macro 



Prevent leaking the if scoping by containing the WA_REG
macro inside its own scope.

Reported-by: default avatarArun Siluvery <arun.siluvery@linux.intel.com>
Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarDave Gordon <david.s.gordon@intel.com>
[danvet: Appease checkpatch.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 37876df6

drivers/gpu/drm/i915/intel_ringbuffer.c

+2 −2
Original line number Diff line number Diff line
@@ -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))