drm/amd/amdgpu: Fix missing error return on kzalloc failure

ColinIanKing · alexdeucher · commit 467e00b30dfe · 2025-09-03T16:27:56.000-04:00
Currently the kzalloc failure check just sets reports the failure and sets the variable ret to -ENOMEM, which is not checked later for this specific error. Fix this by just returning -ENOMEM rather than setting ret. Fixes: 4fb9307 ("drm/amd/amdgpu: remove redundant host to psp cmd buf allocations") Signed-off-by: Colin Ian King <colin.i.king@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 1ee9d1a)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -448,7 +448,7 @@ static int psp_sw_init(struct amdgpu_ip_block *ip_block)
 	psp->cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
 	if (!psp->cmd) {
 		dev_err(adev->dev, "Failed to allocate memory to command buffer!\n");
-		ret = -ENOMEM;
+		return -ENOMEM;
 	}
 
 	adev->psp.xgmi_context.supports_extended_data =

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ static int psp_sw_init(struct amdgpu_ip_block *ip_block)`
`448`	`448`	`psp->cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);`
`449`	`449`	`if (!psp->cmd) {`
`450`	`450`	`dev_err(adev->dev, "Failed to allocate memory to command buffer!\n");`
`451`		`- ret = -ENOMEM;`
	`451`	`+ return -ENOMEM;`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`adev->psp.xgmi_context.supports_extended_data =`