Skip to content

Commit c67f0c2

Browse files
uudiinjnikula
authored andcommitted
drm/i915: Fix wrong return value in intel_atomic_check()
In the case of calling check_digital_port_conflicts() failed, a negative error code -EINVAL should be returned. Fixes: bf5da83 ("drm/i915: Move check_digital_port_conflicts() earier") Cc: Ville Syrjälä <[email protected]> Signed-off-by: Tianjia Zhang <[email protected]> Reviewed-by: José Roberto de Souza <[email protected]> Signed-off-by: José Roberto de Souza <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Rodrigo Vivi <[email protected]> (cherry picked from commit 66b51b8) Signed-off-by: Jani Nikula <[email protected]>
1 parent 5fd73c5 commit c67f0c2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/i915/display/intel_display.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14930,7 +14930,7 @@ static int intel_atomic_check(struct drm_device *dev,
1493014930
if (any_ms && !check_digital_port_conflicts(state)) {
1493114931
drm_dbg_kms(&dev_priv->drm,
1493214932
"rejecting conflicting digital port configuration\n");
14933-
ret = EINVAL;
14933+
ret = -EINVAL;
1493414934
goto fail;
1493514935
}
1493614936

0 commit comments

Comments
 (0)