diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2011-06-30 12:19:55 -0700 |
|---|---|---|
| committer | Rebecca Schultz Zavin <rebecca@android.com> | 2011-06-30 15:15:14 -0700 |
| commit | e6ee124528d520d429bf40303340e8be0bcefdaa (patch) | |
| tree | e2d4fd0c9d9c5c6444e5425310f11cf54b134c2b /drivers/gpu/ion/ion_heap.c | |
| parent | c80005ae9ef788dce825629ea07e658714a2adad (diff) | |
gpu: ion: Several fixes
Fix some cases where locks were not released on error paths
Change heap->prio to heap->id to make meaning clearer
Fix kernel doc to match sources
Diffstat (limited to 'drivers/gpu/ion/ion_heap.c')
| -rw-r--r-- | drivers/gpu/ion/ion_heap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/ion/ion_heap.c b/drivers/gpu/ion/ion_heap.c index 7db9537e6f0..7c93577c9b3 100644 --- a/drivers/gpu/ion/ion_heap.c +++ b/drivers/gpu/ion/ion_heap.c @@ -38,12 +38,12 @@ struct ion_heap *ion_heap_create(struct ion_platform_heap *heap_data) return ERR_PTR(-EINVAL); } if (IS_ERR_OR_NULL(heap)) - pr_err("%s: error creating heap %s type %d base %llu size %u\n", + pr_err("%s: error creating heap %s type %d base %lu size %u\n", __func__, heap_data->name, heap_data->type, heap_data->base, heap_data->size); heap->name = heap_data->name; - heap->prio = heap_data->prio; + heap->id = heap_data->id; return heap; } |