As scaler_state can never be null so no need to check this, only check if scaler_id is less than 0 or not.
v2: Add scaler_id check [Jani] v3: Modify commit message[Suraj] Fixes: 73309ed9d598 ("drm/i915/display: WA_14011503117") Signed-off-by: Nemesa Garg <nemesa.g...@intel.com> Reviewed-by: Suraj Kandpal <suraj.kand...@intel.com> --- drivers/gpu/drm/i915/display/skl_scaler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c index cd7ebbeb9508..c6cccf170ff1 100644 --- a/drivers/gpu/drm/i915/display/skl_scaler.c +++ b/drivers/gpu/drm/i915/display/skl_scaler.c @@ -960,7 +960,7 @@ void adl_scaler_ecc_unmask(const struct intel_crtc_state *crtc_state) const struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state; - if (!scaler_state && scaler_state->scaler_id == -1) + if (scaler_state->scaler_id < 0) return; intel_de_write_fw(display, -- 2.25.1