From: Laurent Pinchart Date: Mon, 23 Jun 2014 19:57:22 +0000 (-0300) Subject: v4l: vsp1: Release buffers at stream stop X-Git-Tag: v3.14.28+ltsi~233 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46117370f31bf9e15a1f5e6cf87cbb733011adaa;p=platform%2Fkernel%2Flinux-stable.git v4l: vsp1: Release buffers at stream stop videobuf2 expects no buffer to be owned by the driver when the stop_stream queue operation returns. As the vsp1 driver fails to do so, a warning is generated at stream top time. Fix this by releasing all buffers queued on the IRQ queue in the stop_stream operation handler and marking them as erroneous. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab (cherry picked from commit 9df04e9d9ac6982d16a8a042c8274410ed29fb0e) Signed-off-by: Simon Horman --- diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c index 32fd41f8875c..d7a1998f15a5 100644 --- a/drivers/media/platform/vsp1/vsp1_video.c +++ b/drivers/media/platform/vsp1/vsp1_video.c @@ -742,6 +742,7 @@ static int vsp1_video_stop_streaming(struct vb2_queue *vq) { struct vsp1_video *video = vb2_get_drv_priv(vq); struct vsp1_pipeline *pipe = to_vsp1_pipeline(&video->video.entity); + struct vsp1_video_buffer *buffer; unsigned long flags; int ret; @@ -759,6 +760,8 @@ static int vsp1_video_stop_streaming(struct vb2_queue *vq) /* Remove all buffers from the IRQ queue. */ spin_lock_irqsave(&video->irqlock, flags); + list_for_each_entry(buffer, &video->irqqueue, queue) + vb2_buffer_done(&buffer->buf, VB2_BUF_STATE_ERROR); INIT_LIST_HEAD(&video->irqqueue); spin_unlock_irqrestore(&video->irqlock, flags);