diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-05-28 19:29:23 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-05-28 19:29:23 +0200 |
| commit | 2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44 (patch) | |
| tree | de062b67715e1eb0321032ad2a87f12cb664643b /drivers/gpu/drm/radeon/si_dma.c | |
| parent | arm64: Fix linker script entry point (diff) | |
| parent | ftrace: Make CALLER_ADDRx macros more generic (diff) | |
| download | linux-2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44.tar.xz linux-2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44.zip | |
Merge branch 'ftrace/arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into for-next/core
Core ftrace changes from Steve Rostedt, required by the arm64 support
code.
Diffstat (limited to 'drivers/gpu/drm/radeon/si_dma.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/si_dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/si_dma.c b/drivers/gpu/drm/radeon/si_dma.c index cf0fdad8c278..de0ca070122f 100644 --- a/drivers/gpu/drm/radeon/si_dma.c +++ b/drivers/gpu/drm/radeon/si_dma.c @@ -213,6 +213,7 @@ int si_copy_dma(struct radeon_device *rdev, r = radeon_fence_emit(rdev, fence, ring->idx); if (r) { radeon_ring_unlock_undo(rdev, ring); + radeon_semaphore_free(rdev, &sem, NULL); return r; } |