11 files changed, 40 insertions, 30 deletions

diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 7b0ea3bdfafb..f9d087669d5d 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -634,7 +634,7 @@ int flexcop_frontend_init(struct flexcop_device *fc)
         }
 
         /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */
-        fc->fe = dvb_attach(vp310_mt312_attach,
+        fc->fe = dvb_attach(mt312_attach,
                 &skystar23_samsung_tbdu18132_config, i2c);
         if (fc->fe != NULL) {
                 ops = &fc->fe->ops;
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index d1239b8342f8..7588db1319d0 100644
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -1,6 +1,7 @@
 config DVB_BT8XX
         tristate "BT8xx based PCI cards"
         depends on DVB_CORE && PCI && I2C && VIDEO_BT848
+        depends on HOTPLUG      # due to FW_LOADER
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select DVB_SP887X if !DVB_FE_CUSTOMISE
         select DVB_NXT6000 if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig
index 3d778c5aba68..c03513b2ccae 100644
--- a/drivers/media/dvb/cinergyT2/Kconfig
+++ b/drivers/media/dvb/cinergyT2/Kconfig
@@ -1,6 +1,6 @@
 config DVB_CINERGYT2
         tristate "Terratec CinergyT2/qanu USB2 DVB-T receiver"
-        depends on DVB_CORE && USB
+        depends on DVB_CORE && USB && INPUT
         help
           Support for "TerraTec CinergyT2" USB2.0 Highspeed DVB Receivers
 
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index 8cbdb0ec67e2..588fbe105c27 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -910,15 +910,21 @@ static void dvb_ca_en50221_thread_update_delay(struct dvb_ca_private *ca)
         int curdelay = 100000000;
         int slot;
 
+        /* Beware of too high polling frequency, because one polling
+         * call might take several hundred milliseconds until timeout!
+         */
         for (slot = 0; slot < ca->slot_count; slot++) {
                 switch (ca->slot_info[slot].slot_state) {
                 default:
                 case DVB_CA_SLOTSTATE_NONE:
+                        delay = HZ * 60;  /* 60s */
+                        if (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE))
+                                delay = HZ * 5;  /* 5s */
+                        break;
                 case DVB_CA_SLOTSTATE_INVALID:
-                        delay = HZ * 60;
-                        if (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)) {
-                                delay = HZ / 10;
-                        }
+                        delay = HZ * 60;  /* 60s */
+                        if (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE))
+                                delay = HZ / 10;  /* 100ms */
                         break;
 
                 case DVB_CA_SLOTSTATE_UNINITIALISED:
@@ -926,19 +932,17 @@ static void dvb_ca_en50221_thread_update_delay(struct dvb_ca_private *ca)
                 case DVB_CA_SLOTSTATE_VALIDATE:
                 case DVB_CA_SLOTSTATE_WAITFR:
                 case DVB_CA_SLOTSTATE_LINKINIT:
-                        delay = HZ / 10;
+                        delay = HZ / 10;  /* 100ms */
                         break;
 
                 case DVB_CA_SLOTSTATE_RUNNING:
-                        delay = HZ * 60;
-                        if (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)) {
-                                delay = HZ / 10;
-                        }
+                        delay = HZ * 60;  /* 60s */
+                        if (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE))
+                                delay = HZ / 10;  /* 100ms */
                         if (ca->open) {
                                 if ((!ca->slot_info[slot].da_irq_supported) ||
-                                    (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_DA))) {
-                                        delay = HZ / 10;
-                                }
+                                    (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_DA)))
+                                        delay = HZ / 10;  /* 100ms */
                         }
                         break;
                 }
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 4c1cff9feb2e..cf4584e48b6d 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -1,6 +1,7 @@
 config DVB_USB
         tristate "Support for various USB DVB devices"
         depends on DVB_CORE && USB && I2C
+        depends on HOTPLUG      # due to FW_LOADER
         select FW_LOADER
         help
           By enabling this you will be able to choose the various supported
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 6d2384605927..c20553c4da1f 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -30,7 +30,7 @@ config DVB_CX24123
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_MT312
-        tristate "Zarlink VP310/MT312 based"
+        tristate "Zarlink VP310/MT312/ZL10313 based"
         depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
@@ -97,7 +97,7 @@ comment "DVB-T (terrestrial) frontends"
 
 config DVB_SP8870
         tristate "Spase sp8870 based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -110,7 +110,7 @@ config DVB_SP8870
 
 config DVB_SP887X
         tristate "Spase sp887x based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -144,7 +144,7 @@ config DVB_L64781
 
 config DVB_TDA1004X
         tristate "Philips TDA10045H/TDA10046H based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -211,7 +211,7 @@ config DVB_DIB7000P
 
 config DVB_TDA10048
         tristate "Philips TDA10048HN based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -253,7 +253,7 @@ comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends"
 
 config DVB_NXT200X
         tristate "NxtWave Communications NXT2002/NXT2004 based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -268,7 +268,7 @@ config DVB_NXT200X
 
 config DVB_OR51211
         tristate "Oren OR51211 based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -281,7 +281,7 @@ config DVB_OR51211
 
 config DVB_OR51132
         tristate "Oren OR51132 based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -297,7 +297,7 @@ config DVB_OR51132
 
 config DVB_BCM3510
         tristate "Broadcom BCM3510"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
diff --git a/drivers/media/dvb/frontends/itd1000.c b/drivers/media/dvb/frontends/itd1000.c
index 04c562ccf990..600dad6b41ea 100644
--- a/drivers/media/dvb/frontends/itd1000.c
+++ b/drivers/media/dvb/frontends/itd1000.c
@@ -195,7 +195,7 @@ static void itd1000_set_vco(struct itd1000_state *state, u32 freq_khz)
         }
 }
 
-struct {
+static const struct {
         u32 freq;
         u8 values[10]; /* RFTR, RFST1 - RFST9 */
 } itd1000_fre_values[] = {
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index 081ca3398c76..5ac9b15920f8 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -737,7 +737,7 @@ static void mt312_release(struct dvb_frontend *fe)
 }
 
 #define MT312_SYS_CLK           90000000UL      /* 90 MHz */
-static struct dvb_frontend_ops vp310_mt312_ops = {
+static struct dvb_frontend_ops mt312_ops = {
 
         .info = {
                 .name = "Zarlink ???? DVB-S",
@@ -776,7 +776,7 @@ static struct dvb_frontend_ops vp310_mt312_ops = {
         .set_voltage = mt312_set_voltage,
 };
 
-struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config,
+struct dvb_frontend *mt312_attach(const struct mt312_config *config,
                                         struct i2c_adapter *i2c)
 {
         struct mt312_state *state = NULL;
@@ -795,7 +795,7 @@ struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config,
                 goto error;
 
         /* create dvb_frontend */
-        memcpy(&state->frontend.ops, &vp310_mt312_ops,
+        memcpy(&state->frontend.ops, &mt312_ops,
                 sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
 
@@ -827,12 +827,13 @@ error:
         kfree(state);
         return NULL;
 }
-EXPORT_SYMBOL(vp310_mt312_attach);
+EXPORT_SYMBOL(mt312_attach);
 
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
 
 MODULE_DESCRIPTION("Zarlink VP310/MT312/ZL10313 DVB-S Demodulator driver");
 MODULE_AUTHOR("Andreas Oberritter <obi@linuxtv.org>");
+MODULE_AUTHOR("Matthias Schwarzott <zzam@gentoo.org>");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/media/dvb/frontends/mt312.h b/drivers/media/dvb/frontends/mt312.h
index de796eab3911..29e3bb5496b8 100644
--- a/drivers/media/dvb/frontends/mt312.h
+++ b/drivers/media/dvb/frontends/mt312.h
@@ -37,10 +37,10 @@ struct mt312_config {
 };
 
 #if defined(CONFIG_DVB_MT312) || (defined(CONFIG_DVB_MT312_MODULE) && defined(MODULE))
-struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config,
+struct dvb_frontend *mt312_attach(const struct mt312_config *config,
                                         struct i2c_adapter *i2c);
 #else
-static inline struct dvb_frontend *vp310_mt312_attach(
+static inline struct dvb_frontend *mt312_attach(
         const struct mt312_config *config, struct i2c_adapter *i2c)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index ae882432dd3d..d4339b1b3b68 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -5,6 +5,7 @@ config TTPCI_EEPROM
 config DVB_AV7110
         tristate "AV7110 cards"
         depends on DVB_CORE && PCI && I2C
+        depends on HOTPLUG
         select FW_LOADER if !DVB_AV7110_FIRMWARE
         select TTPCI_EEPROM
         select VIDEO_SAA7146_VV
@@ -123,6 +124,7 @@ config DVB_BUDGET_AV
         depends on DVB_BUDGET_CORE && I2C
         select VIDEO_SAA7146_VV
         depends on VIDEO_DEV    # dependencies of VIDEO_SAA7146_VV
+        depends on HOTPLUG      # dependency of FW_LOADER
         select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/dvb/ttusb-dec/Kconfig b/drivers/media/dvb/ttusb-dec/Kconfig
index 83611012ef34..0712899e39a4 100644
--- a/drivers/media/dvb/ttusb-dec/Kconfig
+++ b/drivers/media/dvb/ttusb-dec/Kconfig
@@ -1,6 +1,7 @@
 config DVB_TTUSB_DEC
         tristate "Technotrend/Hauppauge USB DEC devices"
         depends on DVB_CORE && USB
+        depends on HOTPLUG      # due to FW_LOADER
         select FW_LOADER
         select CRC32
         help