summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dvb-core/dmxdev.c
diff options
context:
space:
mode:
authorHolger Waechtler <devnull@localhost>2003-04-24 08:48:47 +0000
committerHolger Waechtler <devnull@localhost>2003-04-24 08:48:47 +0000
commitd768b768fbe2bc59f1f3335081fbe907dda9e036 (patch)
tree7d024cfd9ec5464b91f211f1ad187b7073137ce3 /linux/drivers/media/dvb/dvb-core/dmxdev.c
parenteb64d43383bd1b88d27fc2782e63c851653ddcb8 (diff)
downloadmediapointer-dvb-s2-d768b768fbe2bc59f1f3335081fbe907dda9e036.tar.gz
mediapointer-dvb-s2-d768b768fbe2bc59f1f3335081fbe907dda9e036.tar.bz2
- #include "compat.h" --> #include "dvb_compat.h"
- return POLL_ERR in case of filter timeout
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core/dmxdev.c')
-rw-r--r--linux/drivers/media/dvb/dvb-core/dmxdev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c
index 403fbbcdf..b158fca78 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c
@@ -1003,7 +1003,8 @@ unsigned int dvb_demux_poll (struct file *file, poll_table *wait)
poll_wait(file, &dmxdevfilter->buffer.queue, wait);
if (dmxdevfilter->state != DMXDEV_STATE_GO &&
- dmxdevfilter->state != DMXDEV_STATE_DONE)
+ dmxdevfilter->state != DMXDEV_STATE_DONE &&
+ dmxdevfilter->state != DMXDEV_STATE_TIMEDOUT)
return 0;
if (dmxdevfilter->buffer.error)