diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-27 09:17:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-27 09:17:21 +0200 |
| commit | 8d12ded3dd499e38e8022fe3ec53920d085e57a3 (patch) | |
| tree | 8b73e5a68f24b0bd33430bed8993de979825ffcf /drivers/gpu/drm/msm/msm_ringbuffer.c | |
| parent | d499c106843afa0703a68c64662bf42a16421aec (diff) | |
| parent | 68ab747604da98f0a0414f197f346ac22888fcee (diff) | |
Merge branch 'perf/urgent' into perf/core, before applying dependent patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_ringbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c index 8171537dd7d1..1f14b908b221 100644 --- a/drivers/gpu/drm/msm/msm_ringbuffer.c +++ b/drivers/gpu/drm/msm/msm_ringbuffer.c @@ -56,6 +56,6 @@ fail: void msm_ringbuffer_destroy(struct msm_ringbuffer *ring) { if (ring->bo) - drm_gem_object_unreference(ring->bo); + drm_gem_object_unreference_unlocked(ring->bo); kfree(ring); } |