From d25e5996b13311db8e068ec7e6747e16c46507ad Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 22 Apr 2008 14:45:48 -0300 Subject: [PATCH] --- yaml --- r: 92467 b: refs/heads/master c: 0358d7c580370c5eaf081ac42a41c6e347709051 h: refs/heads/master i: 92465: a0758b2a141bd98cd9571675cd0f82eb45c07ccb 92463: 63a706fd110f0d32e99b9a481a37b5a64bcdf6b5 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-fileops.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e00a6e81720a..91920441ede8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad5f2e859d76dccb7eb1aa942171b1a32211efc2 +refs/heads/master: 0358d7c580370c5eaf081ac42a41c6e347709051 diff --git a/trunk/drivers/media/video/ivtv/ivtv-fileops.c b/trunk/drivers/media/video/ivtv/ivtv-fileops.c index 6fb96f19a866..d949a81339d5 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-fileops.c +++ b/trunk/drivers/media/video/ivtv/ivtv-fileops.c @@ -753,7 +753,7 @@ unsigned int ivtv_v4l2_enc_poll(struct file *filp, poll_table * wait) IVTV_DEBUG_HI_FILE("Encoder poll\n"); poll_wait(filp, &s->waitq, wait); - if (eof || s->q_full.length) + if (eof || s->q_full.length || s->q_io.length) return POLLIN | POLLRDNORM; return 0; }