Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1706625 > unrolled thread

mtd: nand: use dma_mapping_error to check map errors

Started byPan Bian <bianpan2016@163.com>
First post2017-08-08 16:40 +0200
Last post2017-08-13 10:00 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  mtd: nand: use dma_mapping_error to check map errors Pan Bian <bianpan2016@163.com> - 2017-08-08 16:40 +0200
    Re: mtd: nand: use dma_mapping_error to check map errors Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-08-13 10:00 +0200

#1706625 — mtd: nand: use dma_mapping_error to check map errors

FromPan Bian <bianpan2016@163.com>
Date2017-08-08 16:40 +0200
Subjectmtd: nand: use dma_mapping_error to check map errors
Message-ID<ucdPR-1fE-45@gated-at.bofh.it>
The return value of dma_map_single() should be checked by
dma_mapping_error(). However, in function flctl_dma_fifo0_transfer(), its
return value is checked against NULL, which could result in failures.

Signed-off-by: Pan Bian <bianpan2016@163.com>
---
 drivers/mtd/nand/sh_flctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index 891ac7b..2404d66 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -411,7 +411,7 @@ static int flctl_dma_fifo0_transfer(struct sh_flctl *flctl, unsigned long *buf,
 
 	dma_addr = dma_map_single(chan->device->dev, buf, len, dir);
 
-	if (dma_addr)
+	if (!dma_mapping_error(chan->device->dev, dma_addr))
 		desc = dmaengine_prep_slave_single(chan, dma_addr, len,
 			tr_dir, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
 
-- 
1.9.1

[toc] | [next] | [standalone]


#1710447

FromBoris Brezillon <boris.brezillon@free-electrons.com>
Date2017-08-13 10:00 +0200
Message-ID<udVYu-4kw-7@gated-at.bofh.it>
In reply to#1706625
Le Tue,  8 Aug 2017 22:35:42 +0800,
Pan Bian <bianpan2016@163.com> a écrit :

> The return value of dma_map_single() should be checked by
> dma_mapping_error(). However, in function flctl_dma_fifo0_transfer(), its
> return value is checked against NULL, which could result in failures.

Applied, thanks.

Boris

> 
> Signed-off-by: Pan Bian <bianpan2016@163.com>
> ---
>  drivers/mtd/nand/sh_flctl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
> index 891ac7b..2404d66 100644
> --- a/drivers/mtd/nand/sh_flctl.c
> +++ b/drivers/mtd/nand/sh_flctl.c
> @@ -411,7 +411,7 @@ static int flctl_dma_fifo0_transfer(struct sh_flctl *flctl, unsigned long *buf,
>  
>  	dma_addr = dma_map_single(chan->device->dev, buf, len, dir);
>  
> -	if (dma_addr)
> +	if (!dma_mapping_error(chan->device->dev, dma_addr))
>  		desc = dmaengine_prep_slave_single(chan, dma_addr, len,
>  			tr_dir, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
>  

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web