Skip to content

Commit 5ade59d

Browse files
mingqian-0gregkh
authored andcommitted
media: imx-jpeg: Set video drvdata before register video device
commit d2b7ecc upstream. The video drvdata should be set before the video device is registered, otherwise video_drvdata() may return NULL in the open() file ops, and led to oops. Fixes: 2db16c6 ("media: imx-jpeg: Add V4L2 driver for i.MX8 JPEG Encoder/Decoder") Cc: <[email protected]> Signed-off-by: Ming Qian <[email protected]> Reviewed-by: TaoJiang <[email protected]> Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 182b9ed commit 5ade59d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2842,6 +2842,7 @@ static int mxc_jpeg_probe(struct platform_device *pdev)
28422842
jpeg->dec_vdev->vfl_dir = VFL_DIR_M2M;
28432843
jpeg->dec_vdev->device_caps = V4L2_CAP_STREAMING |
28442844
V4L2_CAP_VIDEO_M2M_MPLANE;
2845+
video_set_drvdata(jpeg->dec_vdev, jpeg);
28452846
if (mode == MXC_JPEG_ENCODE) {
28462847
v4l2_disable_ioctl(jpeg->dec_vdev, VIDIOC_DECODER_CMD);
28472848
v4l2_disable_ioctl(jpeg->dec_vdev, VIDIOC_TRY_DECODER_CMD);
@@ -2854,7 +2855,6 @@ static int mxc_jpeg_probe(struct platform_device *pdev)
28542855
dev_err(dev, "failed to register video device\n");
28552856
goto err_vdev_register;
28562857
}
2857-
video_set_drvdata(jpeg->dec_vdev, jpeg);
28582858
if (mode == MXC_JPEG_ENCODE)
28592859
v4l2_info(&jpeg->v4l2_dev,
28602860
"encoder device registered as /dev/video%d (%d,%d)\n",

0 commit comments

Comments
 (0)