Merge tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio

[firefly-linux-kernel-4.4.55.git] / drivers / media / platform / davinci / vpif_capture.c

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 3ccb26ff43c8dfa31935c3f8f1eed6dee126c3c5..fa0a51521772543316a27ec6d98cae3461d7e886 100644 (file)
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -311,6 +311,8 @@ static struct vb2_ops video_qops = {
        .start_streaming        = vpif_start_streaming,
        .stop_streaming         = vpif_stop_streaming,
        .buf_queue              = vpif_buffer_queue,
+       .wait_prepare           = vb2_ops_wait_prepare,
+       .wait_finish            = vb2_ops_wait_finish,
 };
 
 /**
@@ -1656,7 +1658,6 @@ static SIMPLE_DEV_PM_OPS(vpif_pm_ops, vpif_suspend, vpif_resume);
 static __refdata struct platform_driver vpif_driver = {
        .driver = {
                .name   = VPIF_DRIVER_NAME,
-               .owner  = THIS_MODULE,
                .pm     = &vpif_pm_ops,
        },
        .probe = vpif_probe,