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_cs.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_cs.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 1e475eb01417..d891ab779ca7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -265,7 +265,7 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p, /* Only a single BO list is allowed to simplify handling. */ if (p->bo_list) - ret = -EINVAL; + goto free_partial_kdata; ret = amdgpu_cs_p1_bo_handles(p, p->chunks[i].kdata); if (ret) |