From 2ed9201bdd9a8e462d768a838fb2bc944c6887a4 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 26 Jan 2012 12:27:25 +0100 Subject: dma-buf: Move code out of mutex-protected section in dma_buf_attach() Some fields can be set without mutex protection. Initialize them before locking the mutex. Signed-off-by: Laurent Pinchart Reviewed-by: Daniel Vetter Signed-off-by: Sumit Semwal --- drivers/base/dma-buf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/base/dma-buf.c') diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c index 97450a52172..8afe2dd1791 100644 --- a/drivers/base/dma-buf.c +++ b/drivers/base/dma-buf.c @@ -192,10 +192,11 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf, if (attach == NULL) return ERR_PTR(-ENOMEM); - mutex_lock(&dmabuf->lock); - attach->dev = dev; attach->dmabuf = dmabuf; + + mutex_lock(&dmabuf->lock); + if (dmabuf->ops->attach) { ret = dmabuf->ops->attach(dmabuf, dev, attach); if (ret) -- cgit v1.2.3-70-g09d2