Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 036fcde6 authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

media: coda/imx-vdoa: Handle dma_set_coherent_mask error codes 

[ 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: b0444f18 ("[media] coda: add i.MX6 VDOA driver")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7089b97b

drivers/media/platform/coda/imx-vdoa.c

+5 −1
Original line number Diff line number Diff line
@@ -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)