Remove last continue statement from intel_allocate_scaler() by inverting the condition. Thus allocate the scaler if it has not been already allocated.
Cc: Nemesa Garg <[email protected]> Cc: Ville Syrjälä <[email protected]> Signed-off-by: Michał Grzelak <[email protected]> --- drivers/gpu/drm/i915/display/skl_scaler.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c index 89920954c4b3..b3c6376c8603 100644 --- a/drivers/gpu/drm/i915/display/skl_scaler.c +++ b/drivers/gpu/drm/i915/display/skl_scaler.c @@ -350,12 +350,10 @@ static int intel_allocate_scaler(struct intel_crtc_scaler_state *scaler_state, } for (scaler_id = 0; scaler_id < crtc->num_scalers; scaler_id++) { - if (scaler_state->scalers[scaler_id].in_use) - continue; - - scaler_state->scalers[scaler_id].in_use = true; - - return scaler_id; + if (!scaler_state->scalers[scaler_id].in_use) { + scaler_state->scalers[scaler_id].in_use = true; + return scaler_id; + } } return -1; -- 2.45.2
