From 1c3f374cd1682b774a82d065e45ca1c710fc6ee6 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Tue, 13 Dec 2011 23:48:03 +0800 Subject: [PATCH] --- yaml --- r: 286135 b: refs/heads/master c: 62268ce9170c5466332c046ff6ddafcb67751502 h: refs/heads/master i: 286133: c722e7576cd01ebfb13d3fc15bb6089bcea630e9 286131: 33658b821a72d161ef7032ad782a39fd21945479 286127: 5302bcc299e0a64b2c62b45454a5d0ed5cf56e41 v: v3 --- [refs] | 2 +- trunk/drivers/dma/mxs-dma.c | 2 +- trunk/include/linux/dmaengine.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cf03fabe20f8..9b09f1206373 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ad7a345a4f17c08a1bb9bfdbb62f7793d84aa36 +refs/heads/master: 62268ce9170c5466332c046ff6ddafcb67751502 diff --git a/trunk/drivers/dma/mxs-dma.c b/trunk/drivers/dma/mxs-dma.c index 6548595c26dc..493af2f6e33a 100644 --- a/trunk/drivers/dma/mxs-dma.c +++ b/trunk/drivers/dma/mxs-dma.c @@ -391,7 +391,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg( idx = 0; } - if (direction == DMA_NONE) { + if (direction == DMA_TRANS_NONE) { ccw = &mxs_chan->ccw[idx++]; pio = (u32 *) sgl; diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h index 5532bb8b500c..679b349d9b66 100644 --- a/trunk/include/linux/dmaengine.h +++ b/trunk/include/linux/dmaengine.h @@ -88,6 +88,7 @@ enum dma_transfer_direction { DMA_MEM_TO_DEV, DMA_DEV_TO_MEM, DMA_DEV_TO_DEV, + DMA_TRANS_NONE, }; /**