diff --git a/[refs] b/[refs]
index f85d5453233e..d858d66527d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dde7a4fa2b197d298c3f1b97a7f78fd1c3a1bda
+refs/heads/master: e2be32ac8017d1bcb293f8c11c046ff654991385
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index f31de98bbfa5..9de66769b623 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -101,6 +101,8 @@ static void fe_release(struct tuner *t)
 
 	if (fe_tuner_ops->release)
 		fe_tuner_ops->release(&t->fe);
+
+	t->fe.ops.analog_demod_ops = NULL;
 }
 
 static void fe_standby(struct tuner *t)
@@ -353,6 +355,8 @@ static void set_type(struct i2c_client *c, unsigned int type,
 		break;
 	}
 
+	ops = t->fe.ops.analog_demod_ops;
+
 	if (((NULL == ops) ||
 	     ((NULL == ops->set_tv_freq) && (NULL == ops->set_radio_freq))) &&
 	    (fe_tuner_ops->set_analog_params)) {