From: Wei Yongjun Date: Tue, 23 Mar 2021 11:28:55 +0000 (+0100) Subject: media: imx-jpeg: Fix error return code in mxc_jpeg_probe() X-Git-Tag: v5.13-rc1~124^2~181 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb3b597abdcec889876669e5dea2a80ea0ddbdd0;p=thirdparty%2Fkernel%2Flinux.git media: imx-jpeg: Fix error return code in mxc_jpeg_probe() Fix to return negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 2db16c6ed72c ("media: imx-jpeg: Add V4L2 driver for i.MX8 JPEG Encoder/Decoder") Reported-by: Hulk Robot Signed-off-by: Wei Yongjun Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/imx-jpeg/mxc-jpeg.c index adb1715c75d7f..54c93ae6aae08 100644 --- a/drivers/media/platform/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.c @@ -2022,12 +2022,14 @@ static int mxc_jpeg_probe(struct platform_device *pdev) jpeg->m2m_dev = v4l2_m2m_init(&mxc_jpeg_m2m_ops); if (IS_ERR(jpeg->m2m_dev)) { dev_err(dev, "failed to register v4l2 device\n"); + ret = PTR_ERR(jpeg->m2m_dev); goto err_m2m; } jpeg->dec_vdev = video_device_alloc(); if (!jpeg->dec_vdev) { dev_err(dev, "failed to register v4l2 device\n"); + ret = -ENOMEM; goto err_vdev_alloc; } if (mode == MXC_JPEG_ENCODE)