]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/amd/display: Fix wrong return value in dm_update_plane_state()
authorTianjia Zhang <tianjia.zhang@linux.alibaba.com>
Sun, 2 Aug 2020 11:15:36 +0000 (19:15 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 08:57:35 +0000 (09:57 +0100)
[ Upstream commit c35376137e940c3389df2726a92649c01a9844b4 ]

On an error exit path, a negative error code should be returned
instead of a positive return value.

Fixes: 9e869063b0021 ("drm/amd/display: Move iteration out of dm_update_planes")
Cc: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index 2384aa018993dee5ce0d0758c08dfa1c4d85d6ac..7c58085031732043a8274efe962f1760c7bf5a3e 100644 (file)
@@ -6984,8 +6984,7 @@ static int dm_update_plane_state(struct dc *dc,
                                dm_old_plane_state->dc_state,
                                dm_state->context)) {
 
-                       ret = EINVAL;
-                       return ret;
+                       return -EINVAL;
                }