From: harperchen <harperchen1110@gmail.com>
Date: Fri, 3 Mar 2023 11:16:24 +0000 (+0100)
Subject: media: platform: via: Handle error for dma_set_mask
X-Git-Tag: v6.4-rc1~161^2~427
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3af805f70c83525305c1096ec15c64f50d9efa05;p=thirdparty%2Fkernel%2Flinux.git

media: platform: via: Handle error for dma_set_mask

As the potential failure of the dma_set_mask(), we fix this
bug by checking its return value and performing proper error
handling.

Signed-off-by: harperchen <harperchen1110@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---

diff --git a/drivers/media/platform/via/via-camera.c b/drivers/media/platform/via/via-camera.c
index 95483c84c3f25..885917cff7385 100644
--- a/drivers/media/platform/via/via-camera.c
+++ b/drivers/media/platform/via/via-camera.c
@@ -1208,7 +1208,9 @@ static int viacam_probe(struct platform_device *pdev)
 	 * Convince the system that we can do DMA.
 	 */
 	pdev->dev.dma_mask = &viadev->pdev->dma_mask;
-	dma_set_mask(&pdev->dev, 0xffffffff);
+	ret = dma_set_mask(&pdev->dev, 0xffffffff);
+	if (ret)
+		goto out_ctrl_hdl_free;
 	/*
 	 * Fire up the capture port.  The write to 0x78 looks purely
 	 * OLPCish; any system will need to tweak 0x1e.