diff options
| author | Barry Song <Baohua.Song@csr.com> | 2012-09-27 16:35:38 +0800 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-10-24 16:30:37 +0530 |
| commit | 5997e089e4c3a7f0958a8fb0a54ec2b5a6f06168 (patch) | |
| tree | 542db59853e0704a20f39d432f42ade1b8454dbb | |
| parent | 720dfd250e48a8c7fd1b2b8645955413989c4ee0 (diff) | |
| download | linux-3.10-5997e089e4c3a7f0958a8fb0a54ec2b5a6f06168.tar.gz linux-3.10-5997e089e4c3a7f0958a8fb0a54ec2b5a6f06168.tar.bz2 linux-3.10-5997e089e4c3a7f0958a8fb0a54ec2b5a6f06168.zip | |
dmaengine: sirf: fix a typo in dma_prep_interleaved
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>
| -rw-r--r-- | drivers/dma/sirf-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c index 64385cde044..649fd6c965e 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; } |