From 485d2ddc9a1cb4f5ae2989c31f3bbc5c8b0c1786 Mon Sep 17 00:00:00 2001 From: Istvan Varga Date: Sat, 4 Jun 2011 12:21:17 -0300 Subject: [PATCH] --- yaml --- r: 261257 b: refs/heads/master c: 8f76afe8d737b9ecadc0097941c9ef1ece61af9e h: refs/heads/master i: 261255: beeefa7097272d767125300b4d1408ab2edc58a7 v: v3 --- [refs] | 2 +- trunk/drivers/media/common/tuners/xc4000.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a96d649c6d97..357657299c51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e75873c1f80380f190d0270fec566410f59c4829 +refs/heads/master: 8f76afe8d737b9ecadc0097941c9ef1ece61af9e diff --git a/trunk/drivers/media/common/tuners/xc4000.c b/trunk/drivers/media/common/tuners/xc4000.c index c3e564e9f8ca..b04c73bab83c 100644 --- a/trunk/drivers/media/common/tuners/xc4000.c +++ b/trunk/drivers/media/common/tuners/xc4000.c @@ -338,10 +338,12 @@ static int xc_load_i2c_sequence(struct dvb_frontend *fe, const u8 *i2c_sequence) len = i2c_sequence[index] * 256 + i2c_sequence[index+1]; if (len == 0x0000) { /* RESET command */ - result = xc4000_TunerReset(fe); index += 2; +#if 0 /* not needed, as already called by check_firmware() */ + result = xc4000_TunerReset(fe); if (result != XC_RESULT_SUCCESS) return result; +#endif } else if (len & 0x8000) { /* WAIT command */ xc_wait(len & 0x7FFF);