Commit 8f76afe8 authored Jun 04, 2011 by Istvan Varga Committed by Mauro Carvalho Chehab Jul 27, 2011

[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>

parent e75873c1

drivers/media/common/tuners/xc4000.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);