From: Leo (Sunpeng) Li Date: Tue, 20 Feb 2018 21:03:48 +0000 (-0500) Subject: drm/amd/display: Use correct error codes X-Git-Tag: android-x86-8.1-r1~1211^2~21^2~68 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d5400aab15761cd836e3d5d0ad34c330784bbe1a;p=android-x86%2Fkernel.git drm/amd/display: Use correct error codes Should return -ENOMEM when allocation fails. Also, just return the error code instead of using a variable. Signed-off-by: Leo (Sunpeng) Li Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 914cd3f8500a..a215e2bbf2fb 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4761,10 +4761,8 @@ static int dm_update_planes_state(struct dc *dc, WARN_ON(dm_new_plane_state->dc_state); dc_new_plane_state = dc_create_plane_state(dc); - if (!dc_new_plane_state) { - ret = -EINVAL; - return ret; - } + if (!dc_new_plane_state) + return -ENOMEM; DRM_DEBUG_DRIVER("Enabling DRM plane: %d on DRM crtc %d\n", plane->base.id, new_plane_crtc->base.id); @@ -4793,8 +4791,7 @@ static int dm_update_planes_state(struct dc *dc, dm_state->context)) { dc_plane_state_release(dc_new_plane_state); - ret = -EINVAL; - return ret; + return -EINVAL; } dm_new_plane_state->dc_state = dc_new_plane_state;