diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-11 22:31:36 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-11 22:31:36 -0300 |
| commit | 596e34f736e4d6b93889149cfdd56d3dff96ba51 (patch) | |
| tree | af9f600d599de7ef0e4673254faf974baee13c66 /linux/drivers/media/dvb/cinergyT2 | |
| parent | 77c159f6b446fdfacf6a8fc3dde6b2626e122cbd (diff) | |
| parent | 3a43601e74870844d9420353be082c2a5a1fc56e (diff) | |
| download | mediapointer-dvb-s2-596e34f736e4d6b93889149cfdd56d3dff96ba51.tar.gz mediapointer-dvb-s2-596e34f736e4d6b93889149cfdd56d3dff96ba51.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/bluebird
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/cinergyT2')
| -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..0fb56a66a 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; } |