Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm: Fixup failure paths in drm_atomic_helper_set_config

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@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170329174136.10330-1-daniel.vetter@ffwll.ch

+2 -1
+2 -1
drivers/gpu/drm/drm_atomic_helper.c
··· 2293 2293 state->acquire_ctx = ctx; 2294 2294 ret = __drm_atomic_helper_set_config(set, state); 2295 2295 if (ret != 0) 2296 - return ret; 2296 + goto fail; 2297 2297 2298 2298 ret = drm_atomic_commit(state); 2299 2299 2300 + fail: 2300 2301 drm_atomic_state_put(state); 2301 2302 return ret; 2302 2303 }