summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2013-04-15 14:23:14 -0700
committerArve Hjønnevåg <arve@android.com>2013-07-01 14:16:23 -0700
commit8c47868929816b87219c0f75229595b06a8f6c2e (patch)
tree99711784dd3e82a6dfd28f6e2db2ec1e9c3acdbd /drivers/gpu
parent52ae0941a4fe1327a33817b23cfcc23728a57b11 (diff)
downloadolio-linux-3.10-8c47868929816b87219c0f75229595b06a8f6c2e.tar.xz
olio-linux-3.10-8c47868929816b87219c0f75229595b06a8f6c2e.zip
gpu: ion: fix kfree/list_del order
With CONFIG_SLUB_DEBUG_ON it would panic during ion_alloc() ion_buffer_create() io_heap_drain_freelist() Signed-off-by: JP Abgrall <jpa@google.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/ion/ion.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/ion/ion.c b/drivers/gpu/ion/ion.c
index 200b1ad104a..d2d05139a2b 100644
--- a/drivers/gpu/ion/ion.c
+++ b/drivers/gpu/ion/ion.c
@@ -1342,8 +1342,8 @@ static bool ion_heap_drain_freelist(struct ion_heap *heap)
return false;
rt_mutex_lock(&heap->lock);
list_for_each_entry_safe(buffer, tmp, &heap->free_list, list) {
- _ion_buffer_destroy(buffer);
list_del(&buffer->list);
+ _ion_buffer_destroy(buffer);
}
BUG_ON(!list_empty(&heap->free_list));
rt_mutex_unlock(&heap->lock);