From: Laurent Pinchart Date: Sun, 20 Apr 2014 23:59:03 +0000 (-0300) Subject: [media] omap3isp: Cancel all queued buffers when stopping the video stream X-Git-Tag: v3.16-rc1~16^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08344492b350870db4499c7b90220030f07a5d4b;p=thirdparty%2Fkernel%2Flinux.git [media] omap3isp: Cancel all queued buffers when stopping the video stream When stopping a video stream the driver waits for ongoing DMA opeations to complete for the currently active buffer, but doesn't release the non-active queued buffers. This isn't a problem in most cases as the video device is usually closed after the stream is stopped, which will release all the buffers. However the problem would generate a warning when switching to videobuf2. Fix it by cancelling all buffers after DMA operations have completed. Signed-off-by: Laurent Pinchart Acked-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c index e1f998366ba41..ffe56ad4726a6 100644 --- a/drivers/media/platform/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c @@ -1115,6 +1115,8 @@ isp_video_streamoff(struct file *file, void *fh, enum v4l2_buf_type type) /* Stop the stream. */ omap3isp_pipeline_set_stream(pipe, ISP_PIPELINE_STREAM_STOPPED); + omap3isp_video_cancel_stream(video); + mutex_lock(&video->queue_lock); omap3isp_video_queue_streamoff(&vfh->queue); mutex_unlock(&video->queue_lock);