Merge pull request endlessm#96 from endlessm/shell/5899

Stream shutdown fixes, finally there was no possible upstreaming here since master tree have change a lot.
ndufresne · Nov 5, 2015 · 4dd9ab6 · 4dd9ab6
2 parents 832df4a + 42c1538
commit 4dd9ab6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/drivers/media/platform/meson/meson_drv.c b/drivers/media/platform/meson/meson_drv.c
@@ -767,6 +767,7 @@ static int vdec_src_stop_streaming(struct vb2_queue *vq)
 	 * is not really symmetrical with the init routines. */
 	amstream_port_release(amstream_find_port("amstream_vbuf"));
 	ctx->esparser_busy = false;
+	ctx->eos_state = EOS_NONE;
 
 	return 0;
 }

diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
@@ -595,7 +595,7 @@ static int __reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
 		 * We already have buffers allocated, so first check if they
 		 * are not in use and can be freed.
 		 */
-		if (q->memory == V4L2_MEMORY_MMAP && __buffers_in_use(q)) {
+		if (q->ops->buf_cleanup && q->memory == V4L2_MEMORY_MMAP && __buffers_in_use(q)) {
 			dprintk(1, "reqbufs: memory in use, cannot free\n");
 			return -EBUSY;
 		}