Instead of setting range=NULL and using that for a cleaner
exit on failure better to use the return value r for cleanup
and proper return.

Signed-off-by: Sunil Khatri <[email protected]>
---
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
index ffb7b36e577c..b036e22e0ec0 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
@@ -1746,7 +1746,6 @@ static int svm_range_validate_and_map(struct mm_struct 
*mm,
                        WRITE_ONCE(p->svms.faulting_task, NULL);
                        if (r) {
                                amdgpu_hmm_range_free(range);
-                               range = NULL;
                                pr_debug("failed %d to get svm range pages\n", 
r);
                        }
                } else {
@@ -1767,12 +1766,12 @@ static int svm_range_validate_and_map(struct mm_struct 
*mm,
                 * Override return value to TRY AGAIN only if prior returns
                 * were successful
                 */
-               if (range && !amdgpu_hmm_range_valid(range) && !r) {
+               if (!r && range && !amdgpu_hmm_range_valid(range) ) {
                        pr_debug("hmm update the range, need validate again\n");
                        r = -EAGAIN;
                }
                /* Free the hmm range */
-               if (range)
+               if (r)
                        amdgpu_hmm_range_free(range);
 
 
-- 
2.34.1

Reply via email to