diff options
| author | Pan Bian <bianpan2016@163.com> | 2021-01-19 04:11:27 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-27 11:54:55 +0100 |
| commit | 931bc41c59e327617d414d05c44c5dea3baa14d0 (patch) | |
| tree | 5916e8b8a8079f47d028e4f19d3c77112ba6677d | |
| parent | 9cb683c3c471f99018891f7551390217de4b0a8f (diff) | |
| download | kernel_replicant_linux-931bc41c59e327617d414d05c44c5dea3baa14d0.tar.gz kernel_replicant_linux-931bc41c59e327617d414d05c44c5dea3baa14d0.tar.bz2 kernel_replicant_linux-931bc41c59e327617d414d05c44c5dea3baa14d0.zip | |
drm/atomic: put state on error path
commit 43b67309b6b2a3c08396cc9b3f83f21aa529d273 upstream.
Put the state before returning error code.
Fixes: 44596b8c4750 ("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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index f9170b4b22e7..8a871e5c3e26 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3007,7 +3007,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); |