From: Greg Kroah-Hartman Date: Wed, 1 Mar 2023 15:29:11 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v4.19.275~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=052424ac941936bfcfb01d045723815281ae07b4;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch --- diff --git a/queue-4.19/dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch b/queue-4.19/dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch new file mode 100644 index 00000000000..77881667d4b --- /dev/null +++ b/queue-4.19/dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch @@ -0,0 +1,38 @@ +From da2ad87fba0891576aadda9161b8505fde81a84d Mon Sep 17 00:00:00 2001 +From: Jiasheng Jiang +Date: Tue, 11 Jan 2022 09:12:39 +0800 +Subject: dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size + +From: Jiasheng Jiang + +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 +Signed-off-by: Jiasheng Jiang +Reviewed-by: Geert Uytterhoeven +Link: https://lore.kernel.org/r/20220111011239.452837-1-jiasheng@iscas.ac.cn +Signed-off-by: Vinod Koul +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Nobuhiro Iwamatsu (CIP) +--- + drivers/dma/sh/rcar-dmac.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/drivers/dma/sh/rcar-dmac.c ++++ b/drivers/dma/sh/rcar-dmac.c +@@ -1816,7 +1816,10 @@ static int rcar_dmac_probe(struct platfo + 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; diff --git a/queue-4.19/series b/queue-4.19/series index 235aaf741a0..8b6a4defca7 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -4,3 +4,4 @@ btrfs-send-limit-number-of-clones-and-allocated-memo.patch ib-hfi1-assign-npages-earlier.patch net-remove-warn_on_once-sk-sk_forward_alloc-from-sk_stream_kill_queues.patch vc_screen-don-t-clobber-return-value-in-vcs_read.patch +dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch