From: Michael Krufky Date: Sun, 21 Oct 2007 17:35:21 +0000 (-0300) Subject: V4L/DVB (6437): tuner: clear analog_demod_ops on release X-Git-Tag: v2.6.25-rc1~1235^2~474 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2be32ac8017d1bcb293f8c11c046ff654991385;p=linux-2.6 V4L/DVB (6437): tuner: clear analog_demod_ops on release Clear analog_demod_ops on release. Fix test for analog_demod_ops after tuner attach. Signed-off-by: Michael Krufky Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index f31de98bbf..9de66769b6 100644 --- a/drivers/media/video/tuner-core.c +++ b/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)) {