[PATCH 5.4 15/86] drm/atomic: put state on error path

[Greg Kroah-Hartman]

From: Pan Bian <bianpan2...@163.com>

commit 43b67309b6b2a3c08396cc9b3f83f21aa529d273 upstream.

Put the state before returning error code.

Fixes: 44596b8c4750 ("drm/atomic: Unify conflicting encoder handling.")
Signed-off-by: Pan Bian <bianpan2...@163.com>
Cc: sta...@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vet...@ffwll.ch>
Link: 
https://patchwork.freedesktop.org/patch/msgid/20210119121127.84127-1-bianpan2...@163.com
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/gpu/drm/drm_atomic_helper.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -2948,7 +2948,7 @@ int drm_atomic_helper_set_config(struct
 
        ret = handle_conflicting_encoders(state, true);
        if (ret)
-               return ret;
+               goto fail;
 
        ret = drm_atomic_commit(state);