diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 07:18:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 07:18:29 -0800 |
| commit | ddedec28b1d5144bc2c765d97003997f3505fd3a (patch) | |
| tree | 3faaa84beca03b4e6dae3f7da7bf0bd681b45c9d /drivers | |
| parent | 8cb68bdf76a356662fda44a2af04b505b17c1b56 (diff) | |
| parent | ada65c74059f8c104f1b467c126205471634c435 (diff) | |
Merge tag 'tag-for-linus-3.8' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
Pull dma-buf updates from Sumit Semwal:
"A fairly small dma-buf pull request for 3.8 - only 2 patches"
* tag 'tag-for-linus-3.8' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
dma-buf: remove fallback for !CONFIG_DMA_SHARED_BUFFER
dma-buf: might_sleep() in dma_buf_unmap_attachment()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/dma-buf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c index 460e22dee36d..a3f79c495a41 100644 --- a/drivers/base/dma-buf.c +++ b/drivers/base/dma-buf.c @@ -298,6 +298,8 @@ void dma_buf_unmap_attachment(struct dma_buf_attachment *attach, struct sg_table *sg_table, enum dma_data_direction direction) { + might_sleep(); + if (WARN_ON(!attach || !attach->dmabuf || !sg_table)) return; |