---

yaml --- r: 29998 b: refs/heads/master c: 774dd5d h: refs/heads/master v: v3
git-mirror · Jun 25, 2006 · 561b0ab · 561b0ab
1 parent 8c81deb
commit 561b0ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be4f451975c6514a9e12451c2ae2ce91d5673b06
+refs/heads/master: 774dd5d9bdcbfe2efb3425e8a0be0b4d01a65c26
diff --git a/trunk/drivers/media/dvb/cinergyT2/cinergyT2.c b/trunk/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -544,15 +544,19 @@ static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct
 {
 	struct dvb_device *dvbdev = file->private_data;
 	struct cinergyt2 *cinergyt2 = dvbdev->priv;
+       unsigned int mask = 0;
 
 	if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem))
 		return -ERESTARTSYS;
 
 	poll_wait(file, &cinergyt2->poll_wq, wait);
 
+       if (cinergyt2->pending_fe_events != 0)
+	       mask |= (POLLIN | POLLRDNORM | POLLPRI);
+
 	mutex_unlock(&cinergyt2->sem);
 
-	return (POLLIN | POLLRDNORM | POLLPRI);
+       return mask;
 }