summaryrefslogtreecommitdiff
path: root/drivers/media/platform/vivid/vivid-vbi-out.c
diff options
context:
space:
mode:
authorPrabhakar Lad <prabhakar.csengg@gmail.com>2014-11-18 08:23:39 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-25 08:12:30 -0200
commit6dfa5131804e8cc0866e2f21ed79ce4b08976cff (patch)
treedeef8f454131f7e082f3fdc019776da99b886ab7 /drivers/media/platform/vivid/vivid-vbi-out.c
parenta48ff17dbb8e1c11f2856ee318170b018d5aa6df (diff)
[media] media: vivid: use vb2_ops_wait_prepare/finish helper
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/vivid/vivid-vbi-out.c')
-rw-r--r--drivers/media/platform/vivid/vivid-vbi-out.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/vivid/vivid-vbi-out.c b/drivers/media/platform/vivid/vivid-vbi-out.c
index 9d00a07ecdcd..4e4c70e1e04a 100644
--- a/drivers/media/platform/vivid/vivid-vbi-out.c
+++ b/drivers/media/platform/vivid/vivid-vbi-out.c
@@ -131,8 +131,8 @@ const struct vb2_ops vivid_vbi_out_qops = {
.buf_queue = vbi_out_buf_queue,
.start_streaming = vbi_out_start_streaming,
.stop_streaming = vbi_out_stop_streaming,
- .wait_prepare = vivid_unlock,
- .wait_finish = vivid_lock,
+ .wait_prepare = vb2_ops_wait_prepare,
+ .wait_finish = vb2_ops_wait_finish,
};
int vidioc_g_fmt_vbi_out(struct file *file, void *priv,