diff options
author | Manu Abraham <abraham.manu@gmail.com> | 2006-06-21 09:27:20 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 01:05:15 -0400 |
commit | 2e506a0faff0caa62e4c9531611684ff61cf1ca4 (patch) | |
tree | 4044f4e09f0d7cd6d49b3a4295e30bc927745aef /drivers/media | |
parent | ed3d1065a4aa7b1e8e5d35ece0eeeafa5bfa6bd1 (diff) |
V4L/DVB (4158): Make ASIC RESET Conditional
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-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 0e35406557e3..2346667721bc 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) | |||
926 | static int dst_probe(struct dst_state *state) | 926 | static int dst_probe(struct dst_state *state) |
927 | { | 927 | { |
928 | mutex_init(&state->dst_mutex); | 928 | mutex_init(&state->dst_mutex); |
929 | if ((rdc_8820_reset(state)) < 0) { | 929 | if (dst_addons & DST_TYPE_HAS_CA) { |
930 | dprintk(verbose, DST_ERROR, 1, "RDC 8820 RESET Failed."); | 930 | if ((rdc_8820_reset(state)) < 0) { |
931 | return -1; | 931 | dprintk(verbose, DST_ERROR, 1, "RDC 8820 RESET Failed."); |
932 | } | 932 | return -1; |
933 | if (dst_addons & DST_TYPE_HAS_CA) | 933 | } |
934 | msleep(4000); | 934 | msleep(4000); |
935 | else | 935 | } else { |
936 | msleep(100); | 936 | msleep(100); |
937 | 937 | } | |
938 | if ((dst_comm_init(state)) < 0) { | 938 | if ((dst_comm_init(state)) < 0) { |
939 | dprintk(verbose, DST_ERROR, 1, "DST Initialization Failed."); | 939 | dprintk(verbose, DST_ERROR, 1, "DST Initialization Failed."); |
940 | return -1; | 940 | return -1; |