projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f4a821b
)
dmaengine: sh: rcar-dmac: Check for error num after setting mask
author
Jiasheng Jiang
<jiasheng@iscas.ac.cn>
Thu, 6 Jan 2022 03:09:39 +0000
(11:09 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 23 Feb 2022 11:03:21 +0000
(12:03 +0100)
commit
2d21543efe332cd8c8f212fb7d365bc8b0690bfa
upstream.
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:
dc312349e875
("dmaengine: rcar-dmac: Widen DMA mask to 40 bits")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link:
https://lore.kernel.org/r/20220106030939.2644320-1-jiasheng@iscas.ac.cn
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/dma/sh/rcar-dmac.c
patch
|
blob
|
history
diff --git
a/drivers/dma/sh/rcar-dmac.c
b/drivers/dma/sh/rcar-dmac.c
index
6885b3d
..
79901d0
100644
(file)
--- a/
drivers/dma/sh/rcar-dmac.c
+++ b/
drivers/dma/sh/rcar-dmac.c
@@
-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)