From f1606b5d28cece44767b74687b5481d01b687af7 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Mon, 4 Jun 2007 16:00:45 -0300
Subject: [PATCH] --- yaml --- r: 61311 b: refs/heads/master c:
 052c50d91642f10e10c3c10837c89a7355881e76 h: refs/heads/master i:   61309:
 6ca4c699f89626a376af8aa7f7787a4ccc8cceb3   61307:
 8bb2cfdfb1f89b9d14f7a5cfd56ffc82fdc2669a   61303:
 e49b0f89d1fb63639b2f3f143e62d1a88f522b21   61295:
 a3eec493765c3d3b904cd0e770d8f462a5ca71d5   61279:
 d743368e3b5e165b85f9241cd28aa3d248588109   61247:
 e5b437f07b12dc7525ef7fdfb312dd8ee797dfcb   61183:
 29b487e8a30f5f000eda6a9f9703744fb64614d2 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/media/video/tuner-core.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 49ecffee04ea..6288c1105d5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 024cf53089f7c8e58934407f07ca2a7b5bed3b06
+refs/heads/master: 052c50d91642f10e10c3c10837c89a7355881e76
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index 0e71a22f1d4f..acbffbfdb508 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -180,8 +180,10 @@ static void set_type(struct i2c_client *c, unsigned int type,
 	/* discard private data, in case set_type() was previously called */
 	if (t->release)
 		t->release(c);
-	kfree(t->priv);
-	t->priv = NULL;
+	else {
+		kfree(t->priv);
+		t->priv = NULL;
+	}
 
 	switch (t->type) {
 	case TUNER_MT2032:
@@ -566,7 +568,9 @@ static int tuner_detach(struct i2c_client *client)
 
 	if (t->release)
 		t->release(client);
-	kfree(t->priv);
+	else {
+		kfree(t->priv);
+	}
 	kfree(t);
 	return 0;
 }