From f0e9bf380c3c261c3136ffc687491be010956785 Mon Sep 17 00:00:00 2001 From: Allon Huang Date: Tue, 7 Apr 2020 10:19:02 +0800 Subject: [PATCH] drivers: media: rockchip: cif: fix queue buf failed Signed-off-by: Allon Huang Change-Id: I4a5a3686be30847a24497ef13510d2d1d876a4dc --- drivers/media/platform/rockchip/cif/capture.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c index 04f98a5ae42e..74187c3b71c3 100644 --- a/drivers/media/platform/rockchip/cif/capture.c +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -1446,10 +1446,6 @@ static int rkcif_init_vb2_queue(struct vb2_queue *q, struct rkcif_stream *stream, enum v4l2_buf_type buf_type) { - struct rkcif_vdev_node *node; - - node = queue_to_node(q); - q->type = buf_type; q->io_modes = VB2_MMAP | VB2_DMABUF; q->drv_priv = stream; @@ -1458,7 +1454,8 @@ static int rkcif_init_vb2_queue(struct vb2_queue *q, q->buf_struct_size = sizeof(struct rkcif_buffer); q->min_buffers_needed = CIF_REQ_BUFS_MIN; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->lock = &node->vlock; + q->lock = &stream->vnode.vlock; + q->dev = stream->cifdev->dev; return vb2_queue_init(q); }