diff options
author | 2021-03-08 11:34:12 +0200 | |
---|---|---|
committer | 2021-03-08 11:34:12 +0200 | |
commit | 4c9f4865f4604744d4f1a43db22ac6ec9dc8e587 (patch) | |
tree | 46abf93c9b90b880464772ce7d23309ee3616b91 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
parent | soc: ti: omap-prm: Fix occasional abort on reset deassert for dra7 iva (diff) | |
parent | ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 (diff) | |
download | linux-rng-4c9f4865f4604744d4f1a43db22ac6ec9dc8e587.tar.xz linux-rng-4c9f4865f4604744d4f1a43db22ac6ec9dc8e587.zip |
Merge branch 'fixes-rc2' into fixes
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 594a0108e90f..3e240b952e79 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -98,8 +98,7 @@ static int amdgpu_cs_bo_handles_chunk(struct amdgpu_cs_parser *p, return 0; error_free: - if (info) - kvfree(info); + kvfree(info); return r; } |