summaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorIstvan Varga <istvan_v@mailbox.hu>2011-06-04 12:21:17 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 17:52:39 -0300
commit8f76afe8d737b9ecadc0097941c9ef1ece61af9e (patch)
tree23ba83cb5c1a943bfeafa16595cef246d3d8f86b /drivers/media/common
parente75873c1f80380f190d0270fec566410f59c4829 (diff)
downloadop-kernel-dev-8f76afe8d737b9ecadc0097941c9ef1ece61af9e.zip
op-kernel-dev-8f76afe8d737b9ecadc0097941c9ef1ece61af9e.tar.gz
[media] xc4000: removed redundant tuner reset
This patch causes the tuner reset command to be ignored in the firmware code, since this only happens when the BASE/INIT1 firmware is loaded by check_firmware(), and in that case check_firmware() already calls the reset callback before starting to load the firmware. Signed-off-by: Istvan Varga <istvan_v@mailbox.hu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/tuners/xc4000.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/common/tuners/xc4000.c b/drivers/media/common/tuners/xc4000.c
index c3e564e..b04c73b 100644
--- a/drivers/media/common/tuners/xc4000.c
+++ b/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);
OpenPOWER on IntegriCloud