diff options
author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-17 00:25:00 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:39:19 -0500 |
commit | d553cc958aacdc3cdfcecd675b15458aa156c736 (patch) | |
tree | fec14be2db1644ce5db98fe7607a58451e5eb224 /drivers/media/common/tuners | |
parent | c665f4dd99a584036c2bd79a6baa25b06cae42f8 (diff) |
V4L/DVB (9923): xc5000: remove init_fw option
The init_fw option was broken for the HVR-950q because we would call the reset
callback inside of dvb_attach() and the callback had not been setup yet.
Michael Krufky (who added the init_fw feature) says it's no longer required,
so just remove the option completely.
Thanks to user Zzeiss from #linuxtv chat for reporting the issue and
Michael Krufky <mkrufky@linuxtv.org> for proposing the fix.
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Acked-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common/tuners')
-rw-r--r-- | drivers/media/common/tuners/xc5000.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c index e12d13e0cbe9..493ce93caf43 100644 --- a/drivers/media/common/tuners/xc5000.c +++ b/drivers/media/common/tuners/xc5000.c | |||
@@ -36,10 +36,6 @@ static int debug; | |||
36 | module_param(debug, int, 0644); | 36 | module_param(debug, int, 0644); |
37 | MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off)."); | 37 | MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off)."); |
38 | 38 | ||
39 | static int xc5000_load_fw_on_attach; | ||
40 | module_param_named(init_fw, xc5000_load_fw_on_attach, int, 0644); | ||
41 | MODULE_PARM_DESC(init_fw, "Load firmware during driver initialization."); | ||
42 | |||
43 | static DEFINE_MUTEX(xc5000_list_mutex); | 39 | static DEFINE_MUTEX(xc5000_list_mutex); |
44 | static LIST_HEAD(hybrid_tuner_instance_list); | 40 | static LIST_HEAD(hybrid_tuner_instance_list); |
45 | 41 | ||
@@ -1017,9 +1013,6 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, | |||
1017 | memcpy(&fe->ops.tuner_ops, &xc5000_tuner_ops, | 1013 | memcpy(&fe->ops.tuner_ops, &xc5000_tuner_ops, |
1018 | sizeof(struct dvb_tuner_ops)); | 1014 | sizeof(struct dvb_tuner_ops)); |
1019 | 1015 | ||
1020 | if (xc5000_load_fw_on_attach) | ||
1021 | xc5000_init(fe); | ||
1022 | |||
1023 | return fe; | 1016 | return fe; |
1024 | fail: | 1017 | fail: |
1025 | mutex_unlock(&xc5000_list_mutex); | 1018 | mutex_unlock(&xc5000_list_mutex); |