diff options
| author | Manu Abraham <abraham.manu@gmail.com> | 2006-06-21 13:27:20 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 05:05:15 (GMT) |
| commit | 2e506a0faff0caa62e4c9531611684ff61cf1ca4 (patch) | |
| tree | 4044f4e09f0d7cd6d49b3a4295e30bc927745aef | |
| parent | ed3d1065a4aa7b1e8e5d35ece0eeeafa5bfa6bd1 (diff) | |
| download | linux-2e506a0faff0caa62e4c9531611684ff61cf1ca4.tar.xz | |
V4L/DVB (4158): Make ASIC RESET Conditional
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/dvb/bt8xx/dst.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c index 0e35406..2346667 100644 --- a/drivers/media/dvb/bt8xx/dst.c +++ b/drivers/media/dvb/bt8xx/dst.c @@ -926,15 +926,15 @@ static int dst_get_device_id(struct dst_state *state) static int dst_probe(struct dst_state *state) { mutex_init(&state->dst_mutex); - if ((rdc_8820_reset(state)) < 0) { - dprintk(verbose, DST_ERROR, 1, "RDC 8820 RESET Failed."); - return -1; - } - if (dst_addons & DST_TYPE_HAS_CA) + if (dst_addons & DST_TYPE_HAS_CA) { + if ((rdc_8820_reset(state)) < 0) { + dprintk(verbose, DST_ERROR, 1, "RDC 8820 RESET Failed."); + return -1; + } msleep(4000); - else + } else { msleep(100); - + } if ((dst_comm_init(state)) < 0) { dprintk(verbose, DST_ERROR, 1, "DST Initialization Failed."); return -1; |