Merge tag 'tags/upstream-4.20-rc1' of git://git.infradead.org/linux-ubifs

[linux.git] / drivers / media / platform / s3c-camif / camif-capture.c

diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
index 23b008d1a47bb9d1fcc5cd4445084b66a2211400..c3fc94ef251e404a0281612761337660bdf233dd 100644 (file)
--- a/drivers/media/platform/s3c-camif/camif-capture.c
+++ b/drivers/media/platform/s3c-camif/camif-capture.c
@@ -943,7 +943,7 @@ static int s3c_camif_qbuf(struct file *file, void *priv,
        if (vp->owner && vp->owner != priv)
                return -EBUSY;
 
-       return vb2_qbuf(&vp->vb_queue, buf);
+       return vb2_qbuf(&vp->vb_queue, vp->vdev.v4l2_dev->mdev, buf);
 }
 
 static int s3c_camif_dqbuf(struct file *file, void *priv,
@@ -981,7 +981,7 @@ static int s3c_camif_prepare_buf(struct file *file, void *priv,
                                 struct v4l2_buffer *b)
 {
        struct camif_vp *vp = video_drvdata(file);
-       return vb2_prepare_buf(&vp->vb_queue, b);
+       return vb2_prepare_buf(&vp->vb_queue, vp->vdev.v4l2_dev->mdev, b);
 }
 
 static int s3c_camif_g_selection(struct file *file, void *priv,