diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-11 17:14:35 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-11 17:14:35 -0300 |
| commit | 49e6c586ba2502f5cdce194081b3b9cfb590efec (patch) | |
| tree | d7c8e99aeb60b30c456ab6bb59998933d0f76ad3 | |
| parent | cb280e81213d8fd2f87abc3ac2a6a23fd316da5d (diff) | |
| download | mediapointer-dvb-s2-49e6c586ba2502f5cdce194081b3b9cfb590efec.tar.gz mediapointer-dvb-s2-49e6c586ba2502f5cdce194081b3b9cfb590efec.tar.bz2 | |
Fix cinergyt2_poll() to allow non-blocking IO on frontend
From: Dyks, Axel (XL) <xl@xlsigned.net>
cinergyt2_poll()" shouldn't return (POLLIN | POLLRDNORM | POLLPRI) when
there are no pending events. User space programs that do non-bocking IO
using "select()" and/or "poll()" would otherwise produce high system load.
Signed-off-by: Axel Dyks <xl@xlsigned.net>
Acked-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -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; } |