diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-09-13 04:12:20 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-09-13 04:12:20 +0300 |
| commit | f75ee9a8816824683e22aee2790f43a9fc43c613 (patch) | |
| tree | 8eb48525bcd0291668d56d0bc4e8a0467467b9b3 /drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | |
| parent | bd2058dc1aa88ac5690184f85a1e5051b12cd573 (diff) | |
| parent | 20a875e2e86e73d13ec256781a7d55a7885868ec (diff) | |
| download | linux-f75ee9a8816824683e22aee2790f43a9fc43c613.tar.xz | |
Merge branch 'device-properties' into acpi-soc
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index b11f4e8868d7..4aa993d19018 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -1187,7 +1187,8 @@ int amdgpu_uvd_ring_test_ib(struct amdgpu_ring *ring, long timeout) r = 0; } -error: fence_put(fence); + +error: return r; } |