diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-24 01:52:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-24 01:52:15 +0200 |
| commit | 037430078fbbb956a9bd6ada00f528e9d1e4c92c (patch) | |
| tree | 6bfba945b97c1381361aeae9c8396a6e5cfa49a5 /include | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| parent | dmaengine: fix dmaengine_unmap failure (diff) | |
| download | linux-037430078fbbb956a9bd6ada00f528e9d1e4c92c.tar.xz linux-037430078fbbb956a9bd6ada00f528e9d1e4c92c.zip | |
Merge tag 'dmaengine-fixes-3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine
Pull dmaengine fixes from Dan Williams:
"Two fixes for -stable:
- async_mult() sometimes maps less buffers than initially requested.
We end up freeing dmaengine_unmap_data on an invalid pool.
- mv_xor: register write ordering fix"
* tag 'dmaengine-fixes-3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
dmaengine: fix dmaengine_unmap failure
dma: mv_xor: Flush descriptors before activating a channel
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dmaengine.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 8300fb87b84a..72cb0ddb9678 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -429,6 +429,7 @@ typedef bool (*dma_filter_fn)(struct dma_chan *chan, void *filter_param); typedef void (*dma_async_tx_callback)(void *dma_async_param); struct dmaengine_unmap_data { + u8 map_cnt; u8 to_cnt; u8 from_cnt; u8 bidi_cnt; |