aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Song <Baohua.Song@csr.com>2012-09-27 16:35:38 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-31 10:10:21 -0700
commit4853c29c3cd5e7d5ea41bc5edd50e16b1882c294 (patch)
treea0d719e59fab4950cc9af8719c94b7d61315a602
parentcae2c0464b08ffc8b5632cc56049ae7d2b80506f (diff)
downloadlinux-linaro-stable-4853c29c3cd5e7d5ea41bc5edd50e16b1882c294.tar.gz
dmaengine: sirf: fix a typo in dma_prep_interleaved
commit 5997e089e4c3a7f0958a8fb0a54ec2b5a6f06168 upstream. either DEV_TO_MEM or MEM_TO_DEV is supported, so change OR to AND. Signed-off-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/dma/sirf-dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c
index 434ad31174f2..35a329da97fd 100644
--- a/drivers/dma/sirf-dma.c
+++ b/drivers/dma/sirf-dma.c
@@ -428,7 +428,7 @@ static struct dma_async_tx_descriptor *sirfsoc_dma_prep_interleaved(
unsigned long iflags;
int ret;
- if ((xt->dir != DMA_MEM_TO_DEV) || (xt->dir != DMA_DEV_TO_MEM)) {
+ if ((xt->dir != DMA_MEM_TO_DEV) && (xt->dir != DMA_DEV_TO_MEM)) {
ret = -EINVAL;
goto err_dir;
}