aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorSumit Semwal <sumit.semwal@ti.com>2012-01-27 04:39:27 -0500
committerSumit Semwal <sumit.semwal@ti.com>2012-03-26 02:01:58 -0400
commit33ea2dcb39ba50b0b69d1b1dc24702f084b46411 (patch)
treeec1e1b0c223e09861341f82d2aa0b13ec841be95 /drivers/base
parent2ed9201bdd9a8e462d768a838fb2bc944c6887a4 (diff)
dma-buf: add dma_data_direction to unmap dma_buf_op
Some exporters may use DMA map/unmap APIs in dma-buf ops, which require enum dma_data_direction for both map and unmap operations. Thus, the unmap dma_buf_op also needs to have enum dma_data_direction as a parameter. Reported-by: Tomasz Stanislawski <t.stanislaws@samsung.com> Signed-off-by: Sumit Semwal <sumit.semwal@ti.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/dma-buf.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c
index 8afe2dd1791..c9a945fd1a0 100644
--- a/drivers/base/dma-buf.c
+++ b/drivers/base/dma-buf.c
@@ -271,16 +271,19 @@ EXPORT_SYMBOL_GPL(dma_buf_map_attachment);
271 * dma_buf_ops. 271 * dma_buf_ops.
272 * @attach: [in] attachment to unmap buffer from 272 * @attach: [in] attachment to unmap buffer from
273 * @sg_table: [in] scatterlist info of the buffer to unmap 273 * @sg_table: [in] scatterlist info of the buffer to unmap
274 * @direction: [in] direction of DMA transfer
274 * 275 *
275 */ 276 */
276void dma_buf_unmap_attachment(struct dma_buf_attachment *attach, 277void dma_buf_unmap_attachment(struct dma_buf_attachment *attach,
277 struct sg_table *sg_table) 278 struct sg_table *sg_table,
279 enum dma_data_direction direction)
278{ 280{
279 if (WARN_ON(!attach || !attach->dmabuf || !sg_table)) 281 if (WARN_ON(!attach || !attach->dmabuf || !sg_table))
280 return; 282 return;
281 283
282 mutex_lock(&attach->dmabuf->lock); 284 mutex_lock(&attach->dmabuf->lock);
283 attach->dmabuf->ops->unmap_dma_buf(attach, sg_table); 285 attach->dmabuf->ops->unmap_dma_buf(attach, sg_table,
286 direction);
284 mutex_unlock(&attach->dmabuf->lock); 287 mutex_unlock(&attach->dmabuf->lock);
285 288
286} 289}