BCM2835-V4L2: Return buffers to videobuf2 on shutdown

6by9 · 6by9 · commit 55a4a094fe7a · 2015-07-15T23:28:52.000+01:00
raspberrypi#817 Fixes the kernel warning from videobuf2 as buffers are now returned as they are being flushed on stop_streaming.
diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c
@@ -390,6 +390,7 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
 			}
 		} else {
 			/* signal frame completion */
+			vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
 			complete(&dev->capture.frame_cmplt);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,7 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,`
`390`	`390`	`}`
`391`	`391`	`} else {`
`392`	`392`	`/* signal frame completion */`
	`393`	`+ vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);`
`393`	`394`	`complete(&dev->capture.frame_cmplt);`
`394`	`395`	`}`
`395`	`396`	`}`