* [PATCH v2] dma: xilinx: check the return value of dma_set_mask() in zynqmp_dma_probe()
@ 2022-03-05 9:31 Jia-Ju Bai
2022-03-08 8:44 ` Michael Tretter
0 siblings, 1 reply; 2+ messages in thread
From: Jia-Ju Bai @ 2022-03-05 9:31 UTC (permalink / raw)
To: vkoul, michal.simek, m.tretter, lars, libaokun1, yukuai3
Cc: dmaengine, linux-arm-kernel, linux-kernel, Jia-Ju Bai
The function dma_set_mask() in zynqmp_dma_probe() can fail, so its
return value should be checked.
Fixes: b0cc417c1637 ("dmaengine: Add Xilinx zynqmp dma engine driver support")
Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
---
v2:
* Print an error message and forward the return value of dma_set_mask().
Thank Michael for good advice.
---
drivers/dma/xilinx/zynqmp_dma.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/xilinx/zynqmp_dma.c b/drivers/dma/xilinx/zynqmp_dma.c
index 7aa63b652027..2791e9c6a4ea 100644
--- a/drivers/dma/xilinx/zynqmp_dma.c
+++ b/drivers/dma/xilinx/zynqmp_dma.c
@@ -1050,7 +1050,10 @@ static int zynqmp_dma_probe(struct platform_device *pdev)
zdev->dev = &pdev->dev;
INIT_LIST_HEAD(&zdev->common.channels);
- dma_set_mask(&pdev->dev, DMA_BIT_MASK(44));
+ ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(44));
+ if (ret)
+ return dev_err_probe(&pdev->dev, ret, "No usable DMA available\n");
+
dma_cap_set(DMA_MEMCPY, zdev->common.cap_mask);
p = &zdev->common;
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] dma: xilinx: check the return value of dma_set_mask() in zynqmp_dma_probe()
2022-03-05 9:31 [PATCH v2] dma: xilinx: check the return value of dma_set_mask() in zynqmp_dma_probe() Jia-Ju Bai
@ 2022-03-08 8:44 ` Michael Tretter
0 siblings, 0 replies; 2+ messages in thread
From: Michael Tretter @ 2022-03-08 8:44 UTC (permalink / raw)
To: Jia-Ju Bai
Cc: vkoul, michal.simek, lars, libaokun1, yukuai3, dmaengine,
linux-arm-kernel, linux-kernel
On Sat, 05 Mar 2022 01:31:20 -0800, Jia-Ju Bai wrote:
> The function dma_set_mask() in zynqmp_dma_probe() can fail, so its
> return value should be checked.
>
> Fixes: b0cc417c1637 ("dmaengine: Add Xilinx zynqmp dma engine driver support")
> Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Reviewed-by: Michael Tretter <m.tretter@pengutronix.de>
> ---
> v2:
> * Print an error message and forward the return value of dma_set_mask().
> Thank Michael for good advice.
>
> ---
> drivers/dma/xilinx/zynqmp_dma.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/dma/xilinx/zynqmp_dma.c b/drivers/dma/xilinx/zynqmp_dma.c
> index 7aa63b652027..2791e9c6a4ea 100644
> --- a/drivers/dma/xilinx/zynqmp_dma.c
> +++ b/drivers/dma/xilinx/zynqmp_dma.c
> @@ -1050,7 +1050,10 @@ static int zynqmp_dma_probe(struct platform_device *pdev)
> zdev->dev = &pdev->dev;
> INIT_LIST_HEAD(&zdev->common.channels);
>
> - dma_set_mask(&pdev->dev, DMA_BIT_MASK(44));
> + ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(44));
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "No usable DMA available\n");
> +
> dma_cap_set(DMA_MEMCPY, zdev->common.cap_mask);
>
> p = &zdev->common;
> --
> 2.17.1
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-08 8:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-05 9:31 [PATCH v2] dma: xilinx: check the return value of dma_set_mask() in zynqmp_dma_probe() Jia-Ju Bai
2022-03-08 8:44 ` Michael Tretter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).