summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorXuelin Shi <xuelin.shi@freescale.com>2014-05-21 14:02:37 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-07 10:28:25 -0700
commite411566e7dc68df11b817d154fb06e3fd761bc77 (patch)
tree540d47cbdde033fe109c484ca532e55ac04fcaeb /include/linux
parent6a1170d673278d51c8ceee2cb091d4baf4ef1ba2 (diff)
downloadkernel-common-e411566e7dc68df11b817d154fb06e3fd761bc77.tar.gz
kernel-common-e411566e7dc68df11b817d154fb06e3fd761bc77.tar.bz2
kernel-common-e411566e7dc68df11b817d154fb06e3fd761bc77.zip
dmaengine: fix dmaengine_unmap failure
commit c1f43dd9c20d85e66c4d77e284f64ac114abe3f8 upstream. The count which is used to get_unmap_data maybe not the same as the count computed in dmaengine_unmap which causes to free data in a wrong pool. This patch fixes this issue by keeping the map count with unmap_data structure and use this count to get the pool. Signed-off-by: Xuelin Shi <xuelin.shi@freescale.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/dmaengine.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index c5c92d59e531..0a5f55272672 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -433,6 +433,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;