diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-11 17:58:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-11 17:58:04 -0300 |
| commit | da2ce09c5417a5fe750ac5310d6e518bdc5bba49 (patch) | |
| tree | ff46e3f2e6cba83ccf725b0ee485b6428e68f55c /linux/drivers/media/dvb/cinergyT2/cinergyT2.c | |
| parent | c0e1a168c8871c030502120b0f02fda348e14db7 (diff) | |
| parent | 49e6c586ba2502f5cdce194081b3b9cfb590efec (diff) | |
| download | mediapointer-dvb-s2-da2ce09c5417a5fe750ac5310d6e518bdc5bba49.tar.gz mediapointer-dvb-s2-da2ce09c5417a5fe750ac5310d6e518bdc5bba49.tar.bz2 | |
merge: http://linuxtv.org/hg/~mcisely/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.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..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; } |