diff options
| author |   Pan Bian <bianpan2016@163.com> | 2021-01-19 04:11:27 -0800 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2021-01-19 14:35:22 +0100 |
| commit | 43b67309b6b2a3c08396cc9b3f83f21aa529d273 (patch) | |
| tree | 317c024d2cd9bd874fdca8dd1be5cbb34358d862 | |
| parent | drm/vc4: Unify PCM card's driver_name (diff) | |
| download | linux-dev-43b67309b6b2a3c08396cc9b3f83f21aa529d273.tar.xz linux-dev-43b67309b6b2a3c08396cc9b3f83f21aa529d273.zip | |
drm/atomic: put state on error path
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
| -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 ba1507036f26..4a8cbec832bc 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -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); |