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

ColinIanKing · gregkh · commit 17c1e414bdf8 · 2025-09-09T19:02:39.000+02:00
[ Upstream commit 467e00b ] 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) Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -447,7 +447,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
`@@ -447,7 +447,7 @@ static int psp_sw_init(struct amdgpu_ip_block *ip_block)`
`447`	`447`	`psp->cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);`
`448`	`448`	`if (!psp->cmd) {`
`449`	`449`	`dev_err(adev->dev, "Failed to allocate memory to command buffer!\n");`
`450`		`- ret = -ENOMEM;`
	`450`	`+ return -ENOMEM;`
`451`	`451`	`}`
`452`	`452`
`453`	`453`	`adev->psp.xgmi_context.supports_extended_data =`