| From 502c82fc4c7a1a614d8d5f275b7ae2322bf8ef94 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 24 Jun 2020 15:54:18 +0100 |
| Subject: drm/amdgpu: ensure 0 is returned for success in |
| jpeg_v2_5_wait_for_idle |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| [ Upstream commit 57f01856645afe4c3d0f9915ee2bb043e8dd7982 ] |
| |
| In the cases where adev->jpeg.num_jpeg_inst is zero or the condition |
| adev->jpeg.harvest_config & (1 << i) is always non-zero the variable |
| ret is never set to an error condition and the function returns |
| an uninitialized value in ret. Since the only exit condition at |
| the end if the function is a success then explicitly return |
| 0 rather than a potentially uninitialized value in ret. |
| |
| Addresses-Coverity: ("Uninitialized scalar variable") |
| Fixes: 14f43e8f88c5 ("drm/amdgpu: move JPEG2.5 out from VCN2.5") |
| Signed-off-by: Colin Ian King <colin.king@canonical.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c |
| index c04c2078a7c1f..a7fcb55babb85 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c |
| @@ -462,7 +462,7 @@ static int jpeg_v2_5_wait_for_idle(void *handle) |
| return ret; |
| } |
| |
| - return ret; |
| + return 0; |
| } |
| |
| static int jpeg_v2_5_set_clockgating_state(void *handle, |
| -- |
| 2.25.1 |
| |