---

yaml
---
r: 61311
b: refs/heads/master
c: 052c50d
h: refs/heads/master
i:
  61309: 6ca4c69
  61307: 8bb2cfd
  61303: e49b0f8
  61295: a3eec49
  61279: d743368
  61247: e5b437f
  61183: 29b487e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 024cf53089f7c8e58934407f07ca2a7b5bed3b06
+refs/heads/master: 052c50d91642f10e10c3c10837c89a7355881e76

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