diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-12-19 11:22:19 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-12-19 11:22:19 +0100 |
| commit | c1687736b4c359f8963683698ad5cf33e6d7780e (patch) | |
| tree | b062c72c9853bcca3f4849647519cb5a0a82caee /linux/drivers/media/common | |
| parent | eebdebc91edbad9e91a7ac0b8762b12fd4160b0b (diff) | |
| parent | c4542dc81f4ce29264cfdf0ac973a51129685567 (diff) | |
| download | mediapointer-dvb-s2-c1687736b4c359f8963683698ad5cf33e6d7780e.tar.gz mediapointer-dvb-s2-c1687736b4c359f8963683698ad5cf33e6d7780e.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/tuners/tuner-xc2028.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/common/tuners/xc5000.c | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/linux/drivers/media/common/tuners/tuner-xc2028.c b/linux/drivers/media/common/tuners/tuner-xc2028.c index 9536e3d3b..bd010379b 100644 --- a/linux/drivers/media/common/tuners/tuner-xc2028.c +++ b/linux/drivers/media/common/tuners/tuner-xc2028.c @@ -1111,6 +1111,10 @@ static int xc2028_sleep(struct dvb_frontend *fe) return 0; tuner_dbg("Putting xc2028/3028 into poweroff mode.\n"); + if (debug > 1) { + tuner_dbg("Printing sleep stack trace:\n"); + dump_stack(); + } mutex_lock(&priv->lock); 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); |