diff options
| author | Prabhakar Lad | 2014-11-18 12:23:39 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-11-25 11:12:30 +0100 |
| commit | 6dfa5131804e8cc0866e2f21ed79ce4b08976cff (patch) | |
| tree | deef8f454131f7e082f3fdc019776da99b886ab7 /drivers/media/platform/vivid/vivid-vid-out.c | |
| parent | [media] staging/media/Makefile: drop omap24xx reference (diff) | |
| download | kernel-qcow2-linux-6dfa5131804e8cc0866e2f21ed79ce4b08976cff.tar.gz kernel-qcow2-linux-6dfa5131804e8cc0866e2f21ed79ce4b08976cff.tar.xz kernel-qcow2-linux-6dfa5131804e8cc0866e2f21ed79ce4b08976cff.zip | |
[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-vid-out.c')
| -rw-r--r-- | drivers/media/platform/vivid/vivid-vid-out.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c index 69c2dbd2d165..078bc35571b4 100644 --- a/drivers/media/platform/vivid/vivid-vid-out.c +++ b/drivers/media/platform/vivid/vivid-vid-out.c @@ -209,8 +209,8 @@ const struct vb2_ops vivid_vid_out_qops = { .buf_queue = vid_out_buf_queue, .start_streaming = vid_out_start_streaming, .stop_streaming = vid_out_stop_streaming, - .wait_prepare = vivid_unlock, - .wait_finish = vivid_lock, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, }; /* |