diff options
| author | Jiri Kosina <jkosina@suse.com> | 2024-11-18 21:31:09 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2024-11-18 21:31:09 +0100 |
| commit | 873c578324c7082677303e2921b71fe0f5737ccc (patch) | |
| tree | 40ffb8ce94497874ff7af9af8ff7ada6f7048c1e /drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | |
| parent | f33e46a0c6bddd341d0989484a2546bba7ac4a3c (diff) | |
| parent | 8ee0f23e2672f004e217b38d4fac956cee251c7f (diff) | |
Merge branch 'for-6.13/steelseries' into for-linus
- bugfixes for Steelseries Arctis 1 battery level handling (Bastien Nocera)
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c index 10b61ff63802..7d4b540340e0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c @@ -1203,8 +1203,10 @@ int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id, r = amdgpu_ring_init(adev, ring, 1024, NULL, 0, AMDGPU_RING_PRIO_DEFAULT, NULL); - if (r) + if (r) { + amdgpu_mes_unlock(&adev->mes); goto clean_up_memory; + } amdgpu_mes_ring_to_queue_props(adev, ring, &qprops); @@ -1237,7 +1239,6 @@ clean_up_ring: amdgpu_ring_fini(ring); clean_up_memory: kfree(ring); - amdgpu_mes_unlock(&adev->mes); return r; } |