aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/tuner-core.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2007-10-21 15:22:25 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 19:01:08 -0200
commit16f291684c50497cc92e83f01d354fae187d1f18 (patch)
treebe7afdfd2b57816894e2e05cac042d955a9b73c8 /drivers/media/video/tuner-core.c
parente2be32ac8017d1bcb293f8c11c046ff654991385 (diff)
V4L/DVB (6438): tuner: move analog_demod_priv into struct dvb_frontend
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/tuner-core.c')
-rw-r--r--drivers/media/video/tuner-core.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 9de66769b62..9903b3f2530 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -280,10 +280,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:
@@ -728,9 +724,7 @@ static int tuner_detach(struct i2c_client *client)
if ((ops) && (ops->release))
ops->release(t);
- else {
- kfree(t->priv);
- }
+
kfree(t);
return 0;
}