]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
dmaengine: sirf: fix a typo in dma_prep_interleaved
authorBarry Song <Baohua.Song@csr.com>
Thu, 27 Sep 2012 08:35:38 +0000 (16:35 +0800)
committerVinod 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

index 64385cde044b3feefcc49001edbf0e9ee647bd0d..649fd6c965eb18d91674ce5fb4acb3662b1ce2d2 100644 (file)
@@ -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;
        }