Message ID | 1348734938-20014-1-git-send-email-Barry.Song@csr.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
ping 2012/9/27 Barry Song <Barry.Song@csr.com>: > From: Barry Song <Baohua.Song@csr.com> > > either DEV_TO_MEM or MEM_TO_DEV is supported, so change > OR to AND. > > Signed-off-by: Barry Song <Baohua.Song@csr.com> > --- > 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 434ad31..35a329d 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; > } > -- > 1.7.0.4 >
On Thu, 2012-09-27 at 16:35 +0800, Barry Song wrote: > From: Barry Song <Baohua.Song@csr.com> > > either DEV_TO_MEM or MEM_TO_DEV is supported, so change > OR to AND. > > Signed-off-by: Barry Song <Baohua.Song@csr.com> > --- > 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 434ad31..35a329d 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; > } applied thanks
diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c index 434ad31..35a329d 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; }