From: Jiasheng Jiang Date: Mon, 6 Dec 2021 02:22:01 +0000 (+0100) Subject: media: coda/imx-vdoa: Handle dma_set_coherent_mask error codes X-Git-Tag: Ubuntu-5.4.0-105.119~266 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b3a0d0ce945fe6c5334c9f98a6ec7c2293c5a81d;p=mirror_ubuntu-focal-kernel.git media: coda/imx-vdoa: Handle dma_set_coherent_mask error codes BugLink: https://bugs.launchpad.net/bugs/1960566 [ Upstream commit 43f0633f89947df57fe0b5025bdd741768007708 ] The return value of dma_set_coherent_mask() is not always 0. To catch the exception in case that dma is not support the mask. Link: https://lore.kernel.org/linux-media/20211206022201.1639460-1-jiasheng@iscas.ac.cn Fixes: b0444f18e0b1 ("[media] coda: add i.MX6 VDOA driver") Signed-off-by: Jiasheng Jiang Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin Signed-off-by: Kamal Mostafa Signed-off-by: Stefan Bader --- diff --git a/drivers/media/platform/coda/imx-vdoa.c b/drivers/media/platform/coda/imx-vdoa.c index 8bc0d8371819..dd6e2e320264 100644 --- a/drivers/media/platform/coda/imx-vdoa.c +++ b/drivers/media/platform/coda/imx-vdoa.c @@ -287,7 +287,11 @@ static int vdoa_probe(struct platform_device *pdev) struct resource *res; int ret; - dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); + ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); + if (ret) { + dev_err(&pdev->dev, "DMA enable failed\n"); + return ret; + } vdoa = devm_kzalloc(&pdev->dev, sizeof(*vdoa), GFP_KERNEL); if (!vdoa)