From 7546de2f97f5d0ce1c30c79aa289f39ae014681b Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 21 Oct 2007 14:22:25 -0400 Subject: tuner: move analog_demod_priv into struct dvb_frontend From: Michael Krufky Signed-off-by: Michael Krufky Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/dvb/dvb-core/dvb_frontend.h | 1 linux/drivers/media/video/tda8290.c | 40 ++++++++++++------------ linux/drivers/media/video/tda9887.c | 14 ++++---- linux/drivers/media/video/tuner-core.c | 11 ------ linux/drivers/media/video/tuner-driver.h | 1 5 files changed, 29 insertions(+), 38 deletions(-) --- linux/drivers/media/video/tuner-core.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'linux/drivers/media/video/tuner-core.c') diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index b6de9fecb..d743581bf 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -307,10 +307,6 @@ static void set_type(struct i2c_client *c, unsigned int type, /* discard private data, in case set_type() was previously called */ if ((ops) && (ops->release)) ops->release(t); - else { - kfree(t->priv); - t->priv = NULL; - } switch (t->type) { case TUNER_MT2032: @@ -780,12 +776,7 @@ MOD_DEC_USE_COUNT; #endif if ((ops) && (ops->release)) ops->release(t); - else { - kfree(t->priv); -#if 0 - t->priv = NULL; -#endif - } + kfree(t); return 0; } -- cgit v1.2.3