diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-07-04 17:58:23 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2006-07-04 17:58:23 +0200 |
| commit | 8fbac88a9c801be025c283275f2eb6585a5cc454 (patch) | |
| tree | bd82f6b1848d218e56f57805fdc569b9574e8089 /linux/drivers/media/dvb/cinergyT2/cinergyT2.c | |
| parent | c0b0560a9ed6e97eca6da5f8432c0dbb2fe471ad (diff) | |
| parent | 54b507ede0a1c5349b47f84af7d3d0b417467e3a (diff) | |
| download | mediapointer-dvb-s2-8fbac88a9c801be025c283275f2eb6585a5cc454.tar.gz mediapointer-dvb-s2-8fbac88a9c801be025c283275f2eb6585a5cc454.tar.bz2 | |
sync with master
From: Patrick Boettcher <pb@linuxtv.org>
sync with master
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/dvb/cinergyT2/cinergyT2.c')
| -rw-r--r-- | linux/drivers/media/dvb/cinergyT2/cinergyT2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c index 8dbba1ca7..631120de7 100644 --- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -561,15 +561,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; } |