4 files changed, 40 insertions, 6 deletions

diff --git a/linux/drivers/media/video/mt20xx.c b/linux/drivers/media/video/mt20xx.c
index b73c3e42f..775d57f5d 100644
--- a/linux/drivers/media/video/mt20xx.c
+++ b/linux/drivers/media/video/mt20xx.c
@@ -499,6 +499,14 @@ static int mt2050_init(struct i2c_client *c)
 	return 0;
 }
 
+static void microtune_release(struct i2c_client *c)
+{
+	struct tuner *t = i2c_get_clientdata(c);
+
+	kfree(t->priv);
+	t->priv = NULL;
+}
+
 int microtune_init(struct i2c_client *c)
 {
 	struct microtune_priv *priv = NULL;
@@ -518,6 +526,7 @@ int microtune_init(struct i2c_client *c)
 	t->set_tv_freq    = NULL;
 	t->set_radio_freq = NULL;
 	t->standby    = NULL;
+	t->release        = microtune_release;
 	if (t->std & V4L2_STD_525_60) {
 		tuner_dbg("pinnacle ntsc\n");
 		priv->radio_if2 = 41300 * 1000;
diff --git a/linux/drivers/media/video/tda8290.c b/linux/drivers/media/video/tda8290.c
index f375eb6b8..63d76b925 100644
--- a/linux/drivers/media/video/tda8290.c
+++ b/linux/drivers/media/video/tda8290.c
@@ -599,6 +599,14 @@ static void tda8290_init_tuner(struct i2c_client *c)
 
 /*---------------------------------------------------------------------*/
 
+static void tda8290_release(struct i2c_client *c)
+{
+	struct tuner *t = i2c_get_clientdata(c);
+
+	kfree(t->priv);
+	t->priv = NULL;
+}
+
 int tda8290_init(struct i2c_client *c)
 {
 	struct tda8290_priv *priv = NULL;
@@ -667,6 +675,7 @@ int tda8290_init(struct i2c_client *c)
 	t->set_radio_freq = set_radio_freq;
 	t->has_signal = has_signal;
 	t->standby = standby;
+	t->release = tda8290_release;
 	priv->tda827x_lpsel = 0;
 	t->mode = V4L2_TUNER_ANALOG_TV;
 
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index cce1defd3..38c57a838 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -602,6 +602,14 @@ static void tda9887_set_freq(struct i2c_client *client, unsigned int freq)
 	tda9887_configure(client);
 }
 
+static void tda9887_release(struct i2c_client *c)
+{
+	struct tuner *t = i2c_get_clientdata(c);
+
+	kfree(t->priv);
+	t->priv = NULL;
+}
+
 int tda9887_tuner_init(struct i2c_client *c)
 {
 	struct tda9887_priv *priv = NULL;
@@ -622,6 +630,7 @@ int tda9887_tuner_init(struct i2c_client *c)
 	t->standby = tda9887_standby;
 	t->tuner_status = tda9887_tuner_status;
 	t->get_afc = tda9887_get_afc;
+	t->release = tda9887_release;
 
 	return 0;
 }
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 04f6479fc..b85d415ed 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -204,11 +204,14 @@ static void set_type(struct i2c_client *c, unsigned int type,
 	}
 #endif
 
-#if 1
 	/* discard private data, in case set_type() was previously called */
-	kfree(t->priv);
-	t->priv = NULL;
-#endif
+	if (t->release)
+		t->release(c);
+	else {
+		kfree(t->priv);
+		t->priv = NULL;
+	}
+
 	switch (t->type) {
 	case TUNER_MT2032:
 		microtune_init(c);
@@ -620,10 +623,14 @@ static int tuner_detach(struct i2c_client *client)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 MOD_DEC_USE_COUNT;
 #endif
-	kfree(t->priv);
+	if (t->release)
+		t->release(client);
+	else {
+		kfree(t->priv);
 #if 0
-	t->priv = NULL;
+		t->priv = NULL;
 #endif
+	}
 	kfree(t);
 	return 0;
 }