[PATCH 5.4 15/86] drm/atomic: put state on error path
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2021-01-26 08:41:54
Also in:
lkml
From: Pan Bian <redacted>
commit 43b67309b6b2a3c08396cc9b3f83f21aa529d273 upstream.
Put the state before returning error code.
Fixes: 44596b8c4750 ("drm/atomic: Unify conflicting encoder handling.")
Signed-off-by: Pan Bian <redacted>
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <redacted>
Link: https://patchwork.freedesktop.org/patch/msgid/20210119121127.84127-1-bianpan2016@163.com
Signed-off-by: Greg Kroah-Hartman <gregkh@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);