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;
 }