From 4abb2b331efce21c0e9ba8b9968f1fe1f8b4acd7 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 3 Mar 2022 16:45:53 +0000 Subject: [PATCH 0353/1085] drivers: staging: bcm2835-isp: Do not cleanup mmal vcsm buffer on stop_streaming On stop_streaming() the vcsm buffer handle gets released by the buffer cleanup code. This will subsequently cause and error if userland re-queues the same buffer on the next start_streaming() call. Remove this cleanup code and rely on the vb2_ops->buf_cleanup() call to do the cleanups instead. Signed-off-by: Naushir Patuck --- .../staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 9 --------- 1 file changed, 9 deletions(-) --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c @@ -624,7 +624,6 @@ static void bcm2835_isp_node_stop_stream { struct bcm2835_isp_node *node = vb2_get_drv_priv(q); struct bcm2835_isp_dev *dev = node_get_dev(node); - unsigned int i; int ret; v4l2_dbg(1, debug, &dev->v4l2_dev, "%s: node %s[%d], mmal port %p\n", @@ -655,14 +654,6 @@ static void bcm2835_isp_node_stop_stream } } - /* Release the VCSM handle here to release the associated dmabuf */ - for (i = 0; i < q->num_buffers; i++) { - struct vb2_v4l2_buffer *vb2 = to_vb2_v4l2_buffer(q->bufs[i]); - struct bcm2835_isp_buffer *buf = - container_of(vb2, struct bcm2835_isp_buffer, vb); - bcm2835_isp_mmal_buf_cleanup(&buf->mmal); - } - atomic_dec(&dev->num_streaming); /* If all ports disabled, then disable the component */ if (atomic_read(&dev->num_streaming) == 0) {