Skip to content

Commit

Permalink
drm/atomic: put state on error path
Browse files Browse the repository at this point in the history
Put the state before returning error code.

Fixes: 44596b8 ("drm/atomic: Unify conflicting encoder handling.")
Signed-off-by: Pan Bian <bianpan2016@163.com>
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210119121127.84127-1-bianpan2016@163.com
  • Loading branch information
SinkFinder authored and danvet committed Jan 19, 2021
1 parent 33c7453 commit 43b6730
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_atomic_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 43b6730

Please sign in to comment.