Unverified Commit 812c28dc authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14438 media: imx-jpeg: Set video drvdata before register video device 

Merge Pull Request from: @ci-robot 
 
PR sync from: Huang Xiaojia <huangxiaojia2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JDPYA7LOWB2B3GQ36DXYR4QJ6LRBSBRE/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEANU 
 
Link:https://gitee.com/openeuler/kernel/pulls/14438

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 63f0285c 5e14f993

drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c

+1 −1
Original line number Diff line number Diff line
@@ -2837,6 +2837,7 @@ static int mxc_jpeg_probe(struct platform_device *pdev) 
	jpeg->dec_vdev->vfl_dir = VFL_DIR_M2M;

	jpeg->dec_vdev->device_caps = V4L2_CAP_STREAMING |

					V4L2_CAP_VIDEO_M2M_MPLANE;

	video_set_drvdata(jpeg->dec_vdev, jpeg);

	if (mode == MXC_JPEG_ENCODE) {

		v4l2_disable_ioctl(jpeg->dec_vdev, VIDIOC_DECODER_CMD);

		v4l2_disable_ioctl(jpeg->dec_vdev, VIDIOC_TRY_DECODER_CMD);
@@ -2849,7 +2850,6 @@ static int mxc_jpeg_probe(struct platform_device *pdev) 
		dev_err(dev, "failed to register video device\n");

		goto err_vdev_register;

	}

	video_set_drvdata(jpeg->dec_vdev, jpeg);

	if (mode == MXC_JPEG_ENCODE)

		v4l2_info(&jpeg->v4l2_dev,

			  "encoder device registered as /dev/video%d (%d,%d)\n",