V4L/DVB (4158): Make ASIC RESET Conditional

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Manu Abraham 2006-06-21 10:27:20 -03:00 committed by Mauro Carvalho Chehab
parent ed3d1065a4
commit 2e506a0faf

View File

@ -926,15 +926,15 @@ static int dst_get_device_id(struct dst_state *state)
static int dst_probe(struct dst_state *state) static int dst_probe(struct dst_state *state)
{ {
mutex_init(&state->dst_mutex); mutex_init(&state->dst_mutex);
if ((rdc_8820_reset(state)) < 0) { if (dst_addons & DST_TYPE_HAS_CA) {
dprintk(verbose, DST_ERROR, 1, "RDC 8820 RESET Failed."); if ((rdc_8820_reset(state)) < 0) {
return -1; dprintk(verbose, DST_ERROR, 1, "RDC 8820 RESET Failed.");
} return -1;
if (dst_addons & DST_TYPE_HAS_CA) }
msleep(4000); msleep(4000);
else } else {
msleep(100); msleep(100);
}
if ((dst_comm_init(state)) < 0) { if ((dst_comm_init(state)) < 0) {
dprintk(verbose, DST_ERROR, 1, "DST Initialization Failed."); dprintk(verbose, DST_ERROR, 1, "DST Initialization Failed.");
return -1; return -1;