From 1355702bca2a46877694d2cc563ef746f054d91d Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Mon, 19 Mar 2012 00:34:25 +0100 Subject: [PATCH] --- yaml --- r: 297197 b: refs/heads/master c: 6b607e3a658fee490bdabfdeb739a3eb498b1bff h: refs/heads/master i: 297195: 99244f518dd32b7fa95dbf0891387b7836ef2480 v: v3 --- [refs] | 2 +- trunk/drivers/base/dma-buf.c | 5 ----- trunk/include/linux/dma-buf.h | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 643e3a797d57..ca2ec5350f06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9a24d1ac9cb82baf5ec5efdb6580a9ce0bd5bfc +refs/heads/master: 6b607e3a658fee490bdabfdeb739a3eb498b1bff diff --git a/trunk/drivers/base/dma-buf.c b/trunk/drivers/base/dma-buf.c index 3c8c0232ce43..5641b9c8d50c 100644 --- a/trunk/drivers/base/dma-buf.c +++ b/trunk/drivers/base/dma-buf.c @@ -258,9 +258,7 @@ struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *attach, if (WARN_ON(!attach || !attach->dmabuf)) return ERR_PTR(-EINVAL); - mutex_lock(&attach->dmabuf->lock); sg_table = attach->dmabuf->ops->map_dma_buf(attach, direction); - mutex_unlock(&attach->dmabuf->lock); return sg_table; } @@ -282,10 +280,7 @@ void dma_buf_unmap_attachment(struct dma_buf_attachment *attach, if (WARN_ON(!attach || !attach->dmabuf || !sg_table)) return; - mutex_lock(&attach->dmabuf->lock); attach->dmabuf->ops->unmap_dma_buf(attach, sg_table, direction); - mutex_unlock(&attach->dmabuf->lock); - } EXPORT_SYMBOL_GPL(dma_buf_unmap_attachment); diff --git a/trunk/include/linux/dma-buf.h b/trunk/include/linux/dma-buf.h index bc4203dc6e18..24e0f4828711 100644 --- a/trunk/include/linux/dma-buf.h +++ b/trunk/include/linux/dma-buf.h @@ -88,7 +88,7 @@ struct dma_buf { struct file *file; struct list_head attachments; const struct dma_buf_ops *ops; - /* mutex to serialize list manipulation and other ops */ + /* mutex to serialize list manipulation and attach/detach */ struct mutex lock; void *priv; };