---

yaml --- r: 95068 b: refs/heads/master c: 16928be h: refs/heads/master v: v3
git-mirror · Apr 30, 2008 · 951612e · 951612e
1 parent d0031a0
commit 951612e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff138171ec6f84f311fe8c0395ad7f9e6d04feec
+refs/heads/master: 16928be301b0881f7b7afcf95e0ee7dc3214de8d
diff --git a/trunk/drivers/media/video/ivtv/ivtv-fileops.c b/trunk/drivers/media/video/ivtv/ivtv-fileops.c
@@ -755,8 +755,10 @@ 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 || s->q_io.length)
+	if (s->q_full.length || s->q_io.length)
 		return POLLIN | POLLRDNORM;
+	if (eof)
+		return POLLHUP;
 	return 0;
 }