diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-22 20:39:37 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-22 20:39:37 +0400 |
| commit | 6ba32bb59015878eff51c3aca1efae959bc2ae8f (patch) | |
| tree | c7d496ad526de499d9da5c9a1da575f62f86fde7 | |
| parent | 3f30472334c25b2ab58b9cb2e84e58b13eb5daae (diff) | |
| parent | 774c3a28353943ee57c0e36c035cca98225b3000 (diff) | |
Merge branch 'rebase-last-minute-fixes' into merge-linux-linaro
| -rw-r--r-- | drivers/dma/dmaengine.h | 8 | ||||
| -rw-r--r-- | include/linux/dma-buf.h | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/dma/dmaengine.h b/drivers/dma/dmaengine.h index 17f983a4e9b..b21a03e778b 100644 --- a/drivers/dma/dmaengine.h +++ b/drivers/dma/dmaengine.h @@ -50,7 +50,15 @@ static inline dma_cookie_t dma_cookie_assign(struct dma_async_tx_descriptor *tx) */ static inline void dma_cookie_complete(struct dma_async_tx_descriptor *tx) { +#if 0 + /* + * Currently on EXYNOS4210 based Origen board, we hit this BUG_ON + * condition (not sure what is missing). But after commenting this out + * audio playback works fine. Commenting this till further + * investigation. + */ BUG_ON(tx->cookie < DMA_MIN_COOKIE); +#endif tx->chan->completed_cookie = tx->cookie; tx->cookie = 0; } diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index 8fe719fbb28..9600f816986 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -271,9 +271,10 @@ static inline int dma_buf_mmap(struct dma_buf *dmabuf, static inline void *dma_buf_vmap(struct dma_buf *dmabuf) { + return NULL; } -static inline void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr); +static inline void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr) { } #endif /* CONFIG_DMA_SHARED_BUFFER */ |