Commit 2d21543e authored by 蒋家盛's avatar 蒋家盛 Committed by Vinod Koul
Browse files

dmaengine: sh: rcar-dmac: Check for error num after setting mask 



Because of the possible failure of the dma_supported(), the
dma_set_mask_and_coherent() may return error num.
Therefore, it should be better to check it and return the error if
fails.

Fixes: dc312349 ("dmaengine: rcar-dmac: Widen DMA mask to 40 bits")
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/20220106030939.2644320-1-jiasheng@iscas.ac.cn


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent aa7accb7

drivers/dma/sh/rcar-dmac.c

+3 −1
Original line number Diff line number Diff line
@@ -1869,7 +1869,9 @@ static int rcar_dmac_probe(struct platform_device *pdev) 
	dmac->dev = &pdev->dev;

	platform_set_drvdata(pdev, dmac);

	dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK);

	dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40));

	ret = dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40));

	if (ret)

		return ret;



	ret = rcar_dmac_parse_of(&pdev->dev, dmac);

	if (ret < 0)