From 561b0ab545a8fa1f92a765684d03c230a0eca75f Mon Sep 17 00:00:00 2001 From: "Dyks, Axel (XL)" Date: Sun, 11 Jun 2006 17:14:35 -0300 Subject: [PATCH] --- yaml --- r: 29998 b: refs/heads/master c: 774dd5d9bdcbfe2efb3425e8a0be0b4d01a65c26 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/cinergyT2/cinergyT2.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ffab2e69711f..b489f7bd8659 100644 --- 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 index c7e4134872d4..8cfdad6f50fb 100644 --- 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; }