diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 0e71a22..acbffbf 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -180,8 +180,10 @@
 	/* 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 @@
 
 	if (t->release)
 		t->release(client);
-	kfree(t->priv);
+	else {
+		kfree(t->priv);
+	}
 	kfree(t);
 	return 0;
 }