* Re: [PATCH 1/1] drm/atomic: put state on error path
[not found] <20210119121127.84127-1-bianpan2016@163.com>
@ 2021-01-19 13:36 ` Daniel Vetter
0 siblings, 0 replies; only message in thread
From: Daniel Vetter @ 2021-01-19 13:36 UTC (permalink / raw)
To: Pan Bian
Cc: Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie,
Daniel Vetter, Sean Paul, dri-devel, linux-kernel
On Tue, Jan 19, 2021 at 04:11:27AM -0800, Pan Bian wrote:
> Put the state before returning error code.
>
> Fixes: 44596b8c4750 ("drm/atomic: Unify conflicting encoder handling.")
>
> Signed-off-by: Pan Bian <bianpan2016@163.com>
Nice catch, patch merged to drm-misc-fixes with cc: stable.
-Daniel
> ---
> drivers/gpu/drm/drm_atomic_helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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);
>
> --
> 2.17.1
>
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-19 13:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20210119121127.84127-1-bianpan2016@163.com>
2021-01-19 13:36 ` [PATCH 1/1] drm/atomic: put state on error path Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox