diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-18 13:07:18 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-18 13:07:18 -0200 |
commit | c4542dc81f4ce29264cfdf0ac973a51129685567 (patch) | |
tree | 28a7abc68d51b5772debe99b3c35e56e12fbf676 /linux/drivers/media/common/tuners | |
parent | 35577a13c8b70866b531522be67f11a4cf56a80e (diff) | |
parent | 0a596528dd15515efbbf6ce078155e61610b57e9 (diff) | |
download | mediapointer-dvb-s2-c4542dc81f4ce29264cfdf0ac973a51129685567.tar.gz mediapointer-dvb-s2-c4542dc81f4ce29264cfdf0ac973a51129685567.tar.bz2 |
merge: http://www.linuxtv.org/hg/~dheitmueller/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/common/tuners')
-rw-r--r-- | linux/drivers/media/common/tuners/xc5000.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/linux/drivers/media/common/tuners/xc5000.c b/linux/drivers/media/common/tuners/xc5000.c index 8cfac7002..36c81febb 100644 --- a/linux/drivers/media/common/tuners/xc5000.c +++ b/linux/drivers/media/common/tuners/xc5000.c @@ -36,10 +36,6 @@ static int debug; module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off)."); -static int xc5000_load_fw_on_attach; -module_param_named(init_fw, xc5000_load_fw_on_attach, int, 0644); -MODULE_PARM_DESC(init_fw, "Load firmware during driver initialization."); - static DEFINE_MUTEX(xc5000_list_mutex); static LIST_HEAD(hybrid_tuner_instance_list); @@ -1036,9 +1032,6 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, memcpy(&fe->ops.tuner_ops, &xc5000_tuner_ops, sizeof(struct dvb_tuner_ops)); - if (xc5000_load_fw_on_attach) - xc5000_init(fe); - return fe; fail: mutex_unlock(&xc5000_list_mutex); |