From 983b5e7b3dfffcfbdb1f744f865cae2bb2e9bc49 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 5 Jul 2012 10:39:58 -0300 Subject: [PATCH] --- yaml --- r: 331126 b: refs/heads/master c: 09ae956f9389ad49408d5db4f296e48a26fd4207 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/coda.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 56e0a4c94c10..94ac2e82d10e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fb57f06319ec71c94d842281326aa575066f188 +refs/heads/master: 09ae956f9389ad49408d5db4f296e48a26fd4207 diff --git a/trunk/drivers/media/platform/coda.c b/trunk/drivers/media/platform/coda.c index 7a41ea1bec34..b80c79af0733 100644 --- a/trunk/drivers/media/platform/coda.c +++ b/trunk/drivers/media/platform/coda.c @@ -1349,7 +1349,7 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq, int ret; src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; - src_vq->io_modes = VB2_MMAP; + src_vq->io_modes = VB2_MMAP | VB2_USERPTR; src_vq->drv_priv = ctx; src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); src_vq->ops = &coda_qops; @@ -1360,7 +1360,7 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq, return ret; dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - dst_vq->io_modes = VB2_MMAP; + dst_vq->io_modes = VB2_MMAP | VB2_USERPTR; dst_vq->drv_priv = ctx; dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); dst_vq->ops = &coda_qops;