diff options
| author | JP Abgrall <jpa@google.com> | 2013-12-13 22:24:36 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-14 16:55:41 (GMT) |
| commit | e09539a04285b616ebcc50f2f6b75ad7fbb0aec5 (patch) | |
| tree | d9c74187499fdd27192a918875fbc6d299af4e63 | |
| parent | fe2faea7003516dd615812f663b6a9b141b842ce (diff) | |
| download | linux-e09539a04285b616ebcc50f2f6b75ad7fbb0aec5.tar.xz | |
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>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/android/ion/ion.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index b965f15..b2dcee5 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/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); |