Commit 43b67309 authored by Pan Bian's avatar Pan Bian Committed by Daniel Vetter
Browse files

drm/atomic: put state on error path 



Put the state before returning error code.

Fixes: 44596b8c ("drm/atomic: Unify conflicting encoder handling.")
Signed-off-by: default avatarPan Bian <bianpan2016@163.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210119121127.84127-1-bianpan2016@163.com
parent 33c74535

drivers/gpu/drm/drm_atomic_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -3021,7 +3021,7 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set, 


	ret = handle_conflicting_encoders(state, true);

	if (ret)

		return ret;

		goto fail;



	ret = drm_atomic_commit(state);