1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index a5e2fcbef0f0..6d86eaef934c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
@@ -55,18 +55,18 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev, struct amdgpu_ctx *ctx)
                 r = amd_sched_entity_init(&ring->sched, &ctx->rings[i].entity,
                                           rq, amdgpu_sched_jobs);
                 if (r)
-                        break;
+                        goto failed;
         }
 
-        if (i < adev->num_rings) {
-                for (j = 0; j < i; j++)
-                        amd_sched_entity_fini(&adev->rings[j]->sched,
-                                              &ctx->rings[j].entity);
-                kfree(ctx->fences);
-                ctx->fences = NULL;
-                return r;
-        }
         return 0;
+
+failed:
+        for (j = 0; j < i; j++)
+                amd_sched_entity_fini(&adev->rings[j]->sched,
+                                      &ctx->rings[j].entity);
+        kfree(ctx->fences);
+        ctx->fences = NULL;
+        return r;
 }
 
 static void amdgpu_ctx_fini(struct amdgpu_ctx *ctx)