summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/dvb/dvb-core/dmxdev.c3
-rw-r--r--linux/drivers/media/dvb/frontends/alps_tdmb7.c2
-rw-r--r--linux/drivers/media/dvb/frontends/at76c651.c2
-rw-r--r--linux/drivers/media/dvb/frontends/cx24110.c2
-rw-r--r--linux/drivers/media/dvb/frontends/grundig_29504-401.c2
-rw-r--r--linux/drivers/media/dvb/frontends/grundig_29504-491.c2
-rw-r--r--linux/drivers/media/dvb/frontends/stv0299.c2
-rw-r--r--linux/drivers/media/dvb/frontends/ves1820.c2
-rw-r--r--linux/drivers/media/dvb/ttpci/av7110.c2
-rw-r--r--linux/drivers/media/dvb/ttpci/budget-av.c2
-rw-r--r--linux/drivers/media/dvb/ttpci/budget.c2
-rw-r--r--linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c2
-rw-r--r--linux/include/media/saa7146.h2
13 files changed, 14 insertions, 13 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)
diff --git a/linux/drivers/media/dvb/frontends/alps_tdmb7.c b/linux/drivers/media/dvb/frontends/alps_tdmb7.c
index 9240e3fda..df95c64a6 100644
--- a/linux/drivers/media/dvb/frontends/alps_tdmb7.c
+++ b/linux/drivers/media/dvb/frontends/alps_tdmb7.c
@@ -28,7 +28,7 @@
#include <linux/slab.h>
#include "dvb_frontend.h"
-#include "compat.h"
+#include "dvb_compat.h"
static int debug = 0;
diff --git a/linux/drivers/media/dvb/frontends/at76c651.c b/linux/drivers/media/dvb/frontends/at76c651.c
index 7d26e2990..56ad686f4 100644
--- a/linux/drivers/media/dvb/frontends/at76c651.c
+++ b/linux/drivers/media/dvb/frontends/at76c651.c
@@ -35,7 +35,7 @@
#include "dvb_frontend.h"
#include "dvb_i2c.h"
-#include "compat.h"
+#include "dvb_compat.h"
static int debug = 0;
diff --git a/linux/drivers/media/dvb/frontends/cx24110.c b/linux/drivers/media/dvb/frontends/cx24110.c
index b7de3593e..534371c54 100644
--- a/linux/drivers/media/dvb/frontends/cx24110.c
+++ b/linux/drivers/media/dvb/frontends/cx24110.c
@@ -38,7 +38,7 @@
#include <linux/module.h>
#include <linux/init.h>
-#include "compat.h"
+#include "dvb_compat.h"
#include "dvb_frontend.h"
static int debug = 0;
diff --git a/linux/drivers/media/dvb/frontends/grundig_29504-401.c b/linux/drivers/media/dvb/frontends/grundig_29504-401.c
index 0e7f13886..3806a8a25 100644
--- a/linux/drivers/media/dvb/frontends/grundig_29504-401.c
+++ b/linux/drivers/media/dvb/frontends/grundig_29504-401.c
@@ -29,7 +29,7 @@
#include <linux/string.h>
#include <linux/slab.h>
-#include "compat.h"
+#include "dvb_compat.h"
#include "dvb_frontend.h"
static int debug = 0;
diff --git a/linux/drivers/media/dvb/frontends/grundig_29504-491.c b/linux/drivers/media/dvb/frontends/grundig_29504-491.c
index 04f87d4ab..5db49c1e7 100644
--- a/linux/drivers/media/dvb/frontends/grundig_29504-491.c
+++ b/linux/drivers/media/dvb/frontends/grundig_29504-491.c
@@ -31,7 +31,7 @@
#include <linux/string.h>
#include <linux/slab.h>
-#include "compat.h"
+#include "dvb_compat.h"
#include "dvb_frontend.h"
static int debug = 0;
diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c
index d84da3ee1..f9a9f3c2a 100644
--- a/linux/drivers/media/dvb/frontends/stv0299.c
+++ b/linux/drivers/media/dvb/frontends/stv0299.c
@@ -41,7 +41,7 @@
#include <linux/module.h>
#include <linux/string.h>
-#include "compat.h"
+#include "dvb_compat.h"
#include "dvb_frontend.h"
static int debug = 0;
diff --git a/linux/drivers/media/dvb/frontends/ves1820.c b/linux/drivers/media/dvb/frontends/ves1820.c
index 4e136f2c5..be3a54f14 100644
--- a/linux/drivers/media/dvb/frontends/ves1820.c
+++ b/linux/drivers/media/dvb/frontends/ves1820.c
@@ -27,7 +27,7 @@
#include <linux/slab.h>
#include "dvb_frontend.h"
-#include "compat.h"
+#include "dvb_compat.h"
#if 0
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c
index 66d232d67..8e136af67 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.c
+++ b/linux/drivers/media/dvb/ttpci/av7110.c
@@ -75,7 +75,7 @@
#include "dvb_i2c.h"
#include "dvb_frontend.h"
-#include "compat.h"
+#include "dvb_compat.h"
#if 1
diff --git a/linux/drivers/media/dvb/ttpci/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c
index dd97a9203..0b48cc961 100644
--- a/linux/drivers/media/dvb/ttpci/budget-av.c
+++ b/linux/drivers/media/dvb/ttpci/budget-av.c
@@ -30,7 +30,7 @@
* the project's page is at http://www.linuxtv.org/dvb/
*/
-#include "compat.h"
+#include "dvb_compat.h"
#include "budget.h"
#include <media/saa7146_vv.h>
diff --git a/linux/drivers/media/dvb/ttpci/budget.c b/linux/drivers/media/dvb/ttpci/budget.c
index 6709a1867..de6dabc98 100644
--- a/linux/drivers/media/dvb/ttpci/budget.c
+++ b/linux/drivers/media/dvb/ttpci/budget.c
@@ -29,7 +29,7 @@
* the project's page is at http://www.linuxtv.org/dvb/
*/
-#include "compat.h"
+#include "dvb_compat.h"
#include "budget.h"
diff --git a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index f3f06bebb..8c2bd94c8 100644
--- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -27,7 +27,7 @@
#include <linux/dvb/frontend.h>
#include <linux/dvb/dmx.h>
#include <linux/pci.h>
-#include "compat.h"
+#include "dvb_compat.h"
/*
TTUSB_HWSECTIONS:
diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h
index 5358ae90d..09fee2ee6 100644
--- a/linux/include/media/saa7146.h
+++ b/linux/include/media/saa7146.h
@@ -15,7 +15,7 @@
#include <linux/stringify.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
- #include "compat.h"
+ #include "dvb_compat.h"
#endif
#define SAA7146_VERSION_CODE KERNEL_VERSION(0,5,0)
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-04 09:25:36 +0000