[Intel-gfx] [PATCH] drm: Fixup failure paths in drm_atomic_helper_set_config

[Harry Wentland]

Of course. I totally missed that.

Reviewed-by: Harry Wentland <harry.wentland at amd.com>

Harry

On 2017-03-29 01:41 PM, Daniel Vetter wrote:
> I've screwed this up when removing the legacy backoff hack.
>
> Fixes: 38b6441e4e75 ("drm/atomic-helper: Remove the backoff hack from set_config")
> Cc: Harry Wentland <harry.wentland at amd.com>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Cc: Daniel Vetter <daniel.vetter at intel.com>
> Cc: Jani Nikula <jani.nikula at linux.intel.com>
> Cc: Sean Paul <seanpaul at chromium.org>
> Cc: David Airlie <airlied at linux.ie>
> Cc: dri-devel at lists.freedesktop.org
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>   drivers/gpu/drm/drm_atomic_helper.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 9dc67b52b905..d5915317e7d3 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -2294,10 +2294,11 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set,
>   	state->acquire_ctx = ctx;
>   	ret = __drm_atomic_helper_set_config(set, state);
>   	if (ret != 0)
> -		return ret;
> +		goto fail;
>   
>   	ret = drm_atomic_commit(state);
>   
> +fail:
>   	drm_atomic_state_put(state);
>   	return ret;
>   }