From 7f2153361a48467325762a969d9aa7c4f6446c18 Mon Sep 17 00:00:00 2001 From: Manu Abraham Date: Wed, 21 Jun 2006 10:27:20 -0300 Subject: [PATCH] --- yaml --- r: 30031 b: refs/heads/master c: 2e506a0faff0caa62e4c9531611684ff61cf1ca4 h: refs/heads/master i: 30029: 4d57d37756804960cebeaebe2e6d37448cd940da 30027: 6d22876335a2a0d9d2fb4362505bc273c2ce2ae4 30023: a3ca924c825d63df7a28a17dd88d868fc21511cc 30015: 21b5adf9455e77fc0e356c4deb327e115b759732 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/bt8xx/dst.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0312de2cc5f8..950ddd0aca06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed3d1065a4aa7b1e8e5d35ece0eeeafa5bfa6bd1 +refs/heads/master: 2e506a0faff0caa62e4c9531611684ff61cf1ca4 diff --git a/trunk/drivers/media/dvb/bt8xx/dst.c b/trunk/drivers/media/dvb/bt8xx/dst.c index 0e35406557e3..2346667721bc 100644 --- a/trunk/drivers/media/dvb/bt8xx/dst.c +++ b/trunk/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;