From 92c826d45ce9a6dae4ca83664c28ba142530d809 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Mon, 20 May 2013 23:47:30 -0300 Subject: [PATCH] --- yaml --- r: 377183 b: refs/heads/master c: 57183467c09555d985ae62b79c754e64279381df h: refs/heads/master i: 377181: 609d6b4dae6da51404b74fdc54f4628caa5298b9 377179: c9ea3a31291601b85aef9fbc16b1d7a9e2bda858 377175: 37712aba53c90696b58cf1dd3089f8b9be85546f 377167: 77d96e925a296ad1b9b8e53e802c87ae82c770c3 377151: 389932424b3faa4dd28f34cd5021fb341f518742 v: v3 --- [refs] | 2 +- trunk/drivers/media/v4l2-core/v4l2-mem2mem.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5451f660604f..b35b43f1c5ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 412cb87d28a1f299ee82fe1c8bfe6cbeec9a4655 +refs/heads/master: 57183467c09555d985ae62b79c754e64279381df diff --git a/trunk/drivers/media/v4l2-core/v4l2-mem2mem.c b/trunk/drivers/media/v4l2-core/v4l2-mem2mem.c index 66f599fcb829..9ac39b5d5830 100644 --- a/trunk/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/trunk/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -486,8 +486,10 @@ unsigned int v4l2_m2m_poll(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, if (m2m_ctx->m2m_dev->m2m_ops->unlock) m2m_ctx->m2m_dev->m2m_ops->unlock(m2m_ctx->priv); - poll_wait(file, &src_q->done_wq, wait); - poll_wait(file, &dst_q->done_wq, wait); + if (list_empty(&src_q->done_list)) + poll_wait(file, &src_q->done_wq, wait); + if (list_empty(&dst_q->done_list)) + poll_wait(file, &dst_q->done_wq, wait); if (m2m_ctx->m2m_dev->m2m_ops->lock) m2m_ctx->m2m_dev->m2m_ops->lock(m2m_ctx->priv);