diff options
| author | Jon Medhurst (Tixy) <tixy@linaro.org> | 2015-07-17 12:01:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-22 21:14:08 -0700 |
| commit | 56fa2ece881348d314800b858581f2ae950f8e20 (patch) | |
| tree | 996d9543083f45fa7951398d1e9dbe782a1b3dcd /drivers/staging/android | |
| parent | b20691652b8c09992096490d9dd11319c1e7ce5e (diff) | |
| download | linux-56fa2ece881348d314800b858581f2ae950f8e20.tar.bz2 | |
staging: ion: ion_cma_heap: Don't directly use dma_common_get_sgtable
Use dma_get_sgtable rather than dma_common_get_sgtable so a device's
dma_ops aren't bypassed. This is essential in situations where a device
uses an IOMMU and the physical memory is not contiguous (as the common
function assumes).
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/ion/ion_cma_heap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c index f4211f1be488..86b91fd53852 100644 --- a/drivers/staging/android/ion/ion_cma_heap.c +++ b/drivers/staging/android/ion/ion_cma_heap.c @@ -73,8 +73,7 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, if (!info->table) goto free_mem; - if (dma_common_get_sgtable - (dev, info->table, info->cpu_addr, info->handle, len)) + if (dma_get_sgtable(dev, info->table, info->cpu_addr, info->handle, len)) goto free_table; /* keep this for memory release */ buffer->priv_virt = info; |