OSDN Git Service

drm/amd/display: Use correct error codes
authorLeo (Sunpeng) Li <sunpeng.li@amd.com>
Tue, 20 Feb 2018 21:03:48 +0000 (16:03 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 14 Mar 2018 20:08:41 +0000 (15:08 -0500)
Should return -ENOMEM when allocation fails.
Also, just return the error code instead of using a variable.

Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index 914cd3f..a215e2b 100644 (file)
@@ -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;