diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-hdw.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 94265bd3d926..5b81ba469641 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |||
@@ -60,7 +60,6 @@ static struct pvr2_hdw *unit_pointers[PVR_NUM] = {[ 0 ... PVR_NUM-1 ] = NULL}; | |||
60 | static DEFINE_MUTEX(pvr2_unit_mtx); | 60 | static DEFINE_MUTEX(pvr2_unit_mtx); |
61 | 61 | ||
62 | static int ctlchg; | 62 | static int ctlchg; |
63 | static int initusbreset = 1; | ||
64 | static int procreload; | 63 | static int procreload; |
65 | static int tuner[PVR_NUM] = { [0 ... PVR_NUM-1] = -1 }; | 64 | static int tuner[PVR_NUM] = { [0 ... PVR_NUM-1] = -1 }; |
66 | static int tolerance[PVR_NUM] = { [0 ... PVR_NUM-1] = 0 }; | 65 | static int tolerance[PVR_NUM] = { [0 ... PVR_NUM-1] = 0 }; |
@@ -71,8 +70,6 @@ module_param(ctlchg, int, S_IRUGO|S_IWUSR); | |||
71 | MODULE_PARM_DESC(ctlchg, "0=optimize ctl change 1=always accept new ctl value"); | 70 | MODULE_PARM_DESC(ctlchg, "0=optimize ctl change 1=always accept new ctl value"); |
72 | module_param(init_pause_msec, int, S_IRUGO|S_IWUSR); | 71 | module_param(init_pause_msec, int, S_IRUGO|S_IWUSR); |
73 | MODULE_PARM_DESC(init_pause_msec, "hardware initialization settling delay"); | 72 | MODULE_PARM_DESC(init_pause_msec, "hardware initialization settling delay"); |
74 | module_param(initusbreset, int, S_IRUGO|S_IWUSR); | ||
75 | MODULE_PARM_DESC(initusbreset, "Do USB reset device on probe"); | ||
76 | module_param(procreload, int, S_IRUGO|S_IWUSR); | 73 | module_param(procreload, int, S_IRUGO|S_IWUSR); |
77 | MODULE_PARM_DESC(procreload, | 74 | MODULE_PARM_DESC(procreload, |
78 | "Attempt init failure recovery with firmware reload"); | 75 | "Attempt init failure recovery with firmware reload"); |
@@ -1967,9 +1964,6 @@ static void pvr2_hdw_setup_low(struct pvr2_hdw *hdw) | |||
1967 | } | 1964 | } |
1968 | hdw->fw1_state = FW1_STATE_OK; | 1965 | hdw->fw1_state = FW1_STATE_OK; |
1969 | 1966 | ||
1970 | if (initusbreset) { | ||
1971 | pvr2_hdw_device_reset(hdw); | ||
1972 | } | ||
1973 | if (!pvr2_hdw_dev_ok(hdw)) return; | 1967 | if (!pvr2_hdw_dev_ok(hdw)) return; |
1974 | 1968 | ||
1975 | for (idx = 0; idx < hdw->hdw_desc->client_modules.cnt; idx++) { | 1969 | for (idx = 0; idx < hdw->hdw_desc->client_modules.cnt; idx++) { |