Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 297193
b: refs/heads/master
c: 2ed9201
h: refs/heads/master
i:
  297191: dea7b5a
v: v3
  • Loading branch information
Laurent Pinchart authored and Sumit Semwal committed Mar 19, 2012
1 parent 3018b1a commit 08b1ce1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a9fbc3b73127efba9276e172daa8d122f0fac1a8
refs/heads/master: 2ed9201bdd9a8e462d768a838fb2bc944c6887a4
5 changes: 3 additions & 2 deletions trunk/drivers/base/dma-buf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 08b1ce1

Please sign in to comment.