summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorLudovic Desroches <ludovic.desroches@atmel.com>2015-11-24 10:51:09 +0100
committerVinod Koul <vinod.koul@intel.com>2015-12-05 14:13:51 +0530
commitf5a00eb71902292c5a77d7cc27bdafd09ba3c112 (patch)
tree87652c5924b0379a7b945edb2e47a6dca31f7ce5 /drivers/dma
parent15a03850ab8f0a643c964987cf126e9cfb53aa27 (diff)
downloadlinux-stable-f5a00eb71902292c5a77d7cc27bdafd09ba3c112.tar.gz
linux-stable-f5a00eb71902292c5a77d7cc27bdafd09ba3c112.tar.bz2
linux-stable-f5a00eb71902292c5a77d7cc27bdafd09ba3c112.zip
dmaengine: at_xdmac: fix false condition for memset_sg transfers
The code was not in agreement with the comments. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Cc: stable@vger.kernel.org # 4.3 and later Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/at_xdmac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
index d09277f7dd1a..c344f89a77e8 100644
--- a/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
@@ -1333,7 +1333,7 @@ at_xdmac_prep_dma_memset_sg(struct dma_chan *chan, struct scatterlist *sgl,
* since we don't care about the stride anymore.
*/
if ((i == (sg_len - 1)) &&
- sg_dma_len(ppsg) == sg_dma_len(psg)) {
+ sg_dma_len(psg) == sg_dma_len(sg)) {
dev_dbg(chan2dev(chan),
"%s: desc 0x%p can be merged with desc 0x%p\n",
__func__, desc, pdesc);