Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91c877d4 authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size 



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: 97d49c59 ("dmaengine: rcar-dmac: set scatter/gather max segment size")
Reported-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20220111011239.452837-1-jiasheng@iscas.ac.cn


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarNobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@toshiba.co.jp>
parent 465ce31a

drivers/dma/sh/rcar-dmac.c

+4 −1
Original line number Diff line number Diff line
@@ -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;