diff --git a/[refs] b/[refs] index 9656d92e2857..5b841975360d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a37b4c9bc87a74ed5003c385eae264fc0acf6b35 +refs/heads/master: 5403bbae9bfebe1f2df3a022c83e54f70906cefe diff --git a/trunk/drivers/media/video/tuner-xc2028.c b/trunk/drivers/media/video/tuner-xc2028.c index 0a2ffe4f38d0..89e6e64786ea 100644 --- a/trunk/drivers/media/video/tuner-xc2028.c +++ b/trunk/drivers/media/video/tuner-xc2028.c @@ -461,6 +461,23 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type, } continue; } + if (size >= 0xff00) { + switch (size) { + case 0xff00: + rc = priv->tuner_callback(priv->video_dev, + XC2028_RESET_CLK, 0); + if (rc < 0) { + tuner_err("Error at RESET code %d\n", + (*p) & 0x7f); + return -EINVAL; + } + default: + tuner_info("Invalid RESET code %d\n", + size & 0x7f); + return -EINVAL; + + } + } /* Checks for a sleep command */ if (size & 0x8000) { @@ -627,6 +644,9 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode, priv->bandwidth = bandwidth; } + if (!change_digital_bandwidth && priv->mode == T_DIGITAL_TV) + return 0; + /* Load INIT1, if needed */ tuner_dbg("Load init1 firmware, if exists\n"); type0 = BASE | INIT1;