Merge tag 'ktest-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / amdgpu / jpeg_v2_5.c

diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
index 713c325..7a51c61 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
@@ -449,20 +449,20 @@ static bool jpeg_v2_5_is_idle(void *handle)
 static int jpeg_v2_5_wait_for_idle(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-       int i, ret = 0;
+       int i, ret;
 
        for (i = 0; i < adev->jpeg.num_jpeg_inst; ++i) {
                if (adev->jpeg.harvest_config & (1 << i))
                        continue;
 
-               SOC15_WAIT_ON_RREG(JPEG, i, mmUVD_JRBC_STATUS,
+               ret = SOC15_WAIT_ON_RREG(JPEG, i, mmUVD_JRBC_STATUS,
                        UVD_JRBC_STATUS__RB_JOB_DONE_MASK,
-                       UVD_JRBC_STATUS__RB_JOB_DONE_MASK, ret);
+                       UVD_JRBC_STATUS__RB_JOB_DONE_MASK);
                if (ret)
                        return ret;
        }
 
-       return ret;
+       return 0;
 }
 
 static int jpeg_v2_5_set_clockgating_state(void *handle,