aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/dvb/bt8xx/dst.c
diff options
context:
space:
mode:
authorJohannes Stezenbach2005-05-16 21:54:45 -0700
committerLinus Torvalds2005-05-17 07:59:34 -0700
commit4a2cc1269b6c1404e6e882cee604d55c90927467 (patch)
tree0035cedefc9f64acb8ca584482a5ba4f130f1313 /drivers/media/dvb/bt8xx/dst.c
parentb46dd4456f87fbad634d9a63d607fc54e4381cb4 (diff)
[PATCH] dvb: DST: misc. fixes
removed unused module parameter session removed unnecesary delay for FTA cards (Manu Abraham) Signed-off-by: Johannes Stezenbach <js@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb/bt8xx/dst.c')
-rw-r--r--drivers/media/dvb/bt8xx/dst.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index fc74f4097850..d047e349d706 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -44,13 +44,7 @@ MODULE_PARM_DESC(debug, "debug messages, default is 0 (yes)");
static unsigned int dst_addons;
module_param(dst_addons, int, 0644);
-MODULE_PARM_DESC(dst_addons, "CA daughterboard, default is 0 (no)");
-
-static unsigned int new_fw;
-module_param(new_fw, int, 0644);
-MODULE_PARM_DESC(new_fw, "Support for the new interface firmware, default 0");
-
-
+MODULE_PARM_DESC(dst_addons, "CA daughterboard, default is 0 (No addons)");
#define dprintk if (debug) printk
@@ -787,7 +781,11 @@ static int dst_probe(struct dst_state *state)
dprintk("%s: RDC 8820 RESET Failed.\n", __FUNCTION__);
return -1;
}
- msleep(4000);
+ if (dst_addons & DST_TYPE_HAS_CA)
+ msleep(4000);
+ else
+ msleep(100);
+
if ((dst_comm_init(state)) < 0) {
dprintk("%s: DST Initialization Failed.\n", __FUNCTION__);
return -1;