diff --git a/[refs] b/[refs]
index dc79ba8d33cf..f80be7db712e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f2c983cf5978186ee2c379fd63d04316158fc9b
+refs/heads/master: b628a2a3d4e97044cc9f6818bfb8330d8d0b021a
diff --git a/trunk/drivers/media/dvb/frontends/au8522_decoder.c b/trunk/drivers/media/dvb/frontends/au8522_decoder.c
index ef5fd49363c2..68dba3a4b4da 100644
--- a/trunk/drivers/media/dvb/frontends/au8522_decoder.c
+++ b/trunk/drivers/media/dvb/frontends/au8522_decoder.c
@@ -666,6 +666,11 @@ static int au8522_reset(struct v4l2_subdev *sd, u32 val)
 
 	state->operational_mode = AU8522_ANALOG_MODE;
 
+	/* Clear out any state associated with the digital side of the
+	   chip, so that when it gets powered back up it won't think
+	   that it is already tuned */
+	state->current_frequency = 0;
+
 	au8522_writereg(state, 0xa4, 1 << 5);
 
 	return 0;
diff --git a/trunk/drivers/media/dvb/frontends/au8522_dig.c b/trunk/drivers/media/dvb/frontends/au8522_dig.c
index e2efb25d1a75..65f6a36dfb21 100644
--- a/trunk/drivers/media/dvb/frontends/au8522_dig.c
+++ b/trunk/drivers/media/dvb/frontends/au8522_dig.c
@@ -618,6 +618,11 @@ int au8522_init(struct dvb_frontend *fe)
 
 	state->operational_mode = AU8522_DIGITAL_MODE;
 
+	/* Clear out any state associated with the digital side of the
+	   chip, so that when it gets powered back up it won't think
+	   that it is already tuned */
+	state->current_frequency = 0;
+
 	au8522_writereg(state, 0xa4, 1 << 5);
 
 	au8522_i2c_gate_ctrl(fe, 1);