projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
720dfd2
)
dmaengine: sirf: fix a typo in dma_prep_interleaved
author
Barry Song
<Baohua.Song@csr.com>
Thu, 27 Sep 2012 08:35:38 +0000
(16:35 +0800)
committer
Vinod Koul
<vinod.koul@linux.intel.com>
Wed, 24 Oct 2012 11:00:37 +0000
(16:30 +0530)
either DEV_TO_MEM or MEM_TO_DEV is supported, so change
OR to AND.
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
drivers/dma/sirf-dma.c
patch
|
blob
|
history
diff --git
a/drivers/dma/sirf-dma.c
b/drivers/dma/sirf-dma.c
index
64385cd
..
649fd6c
100644
(file)
--- 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;
}