[PATCH for 4.14,4.19,5.4] dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size

[PATCH for 4.14,4.19,5.4] dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size

[Nobuhiro Iwamatsu]

From: Jiasheng Jiang <jiasheng@iscas.ac.cn>

commit da2ad87fba0891576aadda9161b8505fde81a84d upstream.

As the possible failure of the dma_set_max_seg_size(), it should be
better to check the return value of the dma_set_max_seg_size().

Fixes: 97d49c59e219 ("dmaengine: rcar-dmac: set scatter/gather max segment size")
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20220111011239.452837-1-jiasheng@iscas.ac.cn
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 drivers/dma/sh/rcar-dmac.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c
index eba942441e3823..10a8a6d4e86015 100644
--- a/drivers/dma/sh/rcar-dmac.c
+++ b/drivers/dma/sh/rcar-dmac.c
@@ -1824,7 +1824,10 @@ static int rcar_dmac_probe(struct platform_device *pdev)
 	dmac->dev = &pdev->dev;
 	platform_set_drvdata(pdev, dmac);
 	dmac->dev->dma_parms = &dmac->parms;
-	dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK);
+	ret = dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK);
+	if (ret)
+		return ret;
+
 	ret = dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40));
 	if (ret)
 		return ret;
-- 
2.36.1

Re: [PATCH for 4.14,4.19,5.4] dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size

[Greg KH]

On Wed, Mar 01, 2023 at 06:16:28PM +0900, Nobuhiro Iwamatsu wrote:
> From: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> 
> commit da2ad87fba0891576aadda9161b8505fde81a84d upstream.
> 
> As the possible failure of the dma_set_max_seg_size(), it should be
> better to check the return value of the dma_set_max_seg_size().
> 
> Fixes: 97d49c59e219 ("dmaengine: rcar-dmac: set scatter/gather max segment size")
> Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Link: https://lore.kernel.org/r/20220111011239.452837-1-jiasheng@iscas.ac.cn
> Signed-off-by: Vinod Koul <vkoul@kernel.org>
> Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@toshiba.co.jp>
> ---
>  drivers/dma/sh/rcar-dmac.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c
> index eba942441e3823..10a8a6d4e86015 100644
> --- a/drivers/dma/sh/rcar-dmac.c
> +++ b/drivers/dma/sh/rcar-dmac.c
> @@ -1824,7 +1824,10 @@ static int rcar_dmac_probe(struct platform_device *pdev)
>  	dmac->dev = &pdev->dev;
>  	platform_set_drvdata(pdev, dmac);
>  	dmac->dev->dma_parms = &dmac->parms;
> -	dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK);
> +	ret = dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK);
> +	if (ret)
> +		return ret;
> +
>  	ret = dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40));
>  	if (ret)
>  		return ret;
> -- 
> 2.36.1
> 
> 

Now queued up, thanks.

greg k-h