Skip to content

Commit

Permalink
[media] xc4000: removed redundant tuner reset
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Istvan Varga authored and Mauro Carvalho Chehab committed Jul 27, 2011
1 parent e75873c commit 8f76afe
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/media/common/tuners/xc4000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 8f76afe

Please sign in to comment.