diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2007-10-21 14:22:25 -0400 |
---|---|---|
committer | Michael Krufky <mkrufky@linuxtv.org> | 2007-10-21 14:22:25 -0400 |
commit | 7546de2f97f5d0ce1c30c79aa289f39ae014681b (patch) | |
tree | 521478530f37adbc5748c892ed5751d755f282f0 /linux/drivers/media/video/tuner-core.c | |
parent | af382f57965a976afc138a6d59f64a7ee1ae4485 (diff) | |
download | mediapointer-dvb-s2-7546de2f97f5d0ce1c30c79aa289f39ae014681b.tar.gz mediapointer-dvb-s2-7546de2f97f5d0ce1c30c79aa289f39ae014681b.tar.bz2 |
tuner: move analog_demod_priv into struct dvb_frontend
From: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
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(-)
Diffstat (limited to 'linux/drivers/media/video/tuner-core.c')
-rw-r--r-- | linux/drivers/media/video/tuner-core.c | 11 |
1 files changed, 1 insertions, 10 deletions
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; } |