Merge tag 'media/v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[thirdparty/linux.git] / drivers / media / platform / omap3isp / ispvideo.c

diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index 5658f6a326f77f66ef130cc0a48f002801cc0d86..078d64114b2410daca82f24f9afb07c45b38ab64 100644 (file)
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -940,7 +940,7 @@ isp_video_qbuf(struct file *file, void *fh, struct v4l2_buffer *b)
        int ret;
 
        mutex_lock(&video->queue_lock);
-       ret = vb2_qbuf(&vfh->queue, b);
+       ret = vb2_qbuf(&vfh->queue, video->video.v4l2_dev->mdev, b);
        mutex_unlock(&video->queue_lock);
 
        return ret;
@@ -1028,7 +1028,7 @@ static int isp_video_check_external_subdevs(struct isp_video *video,
        ctrls.count = 1;
        ctrls.controls = &ctrl;
 
-       ret = v4l2_g_ext_ctrls(pipe->external->ctrl_handler, &ctrls);
+       ret = v4l2_g_ext_ctrls(pipe->external->ctrl_handler, NULL, &ctrls);
        if (ret < 0) {
                dev_warn(isp->dev, "no pixel rate control in subdev %s\n",
                         pipe->external->name);