---

yaml --- r: 327495 b: refs/heads/master c: cd7cf78 h: refs/heads/master i: 327493: 45947af 327491: c6f2f2c 327487: ea26d1a v: v3
git-mirror · Aug 6, 2012 · 886e263 · 886e263
1 parent ae7efb6
commit 886e263
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f8d81584964730b08753da34f1e3fb7981cf742
+refs/heads/master: cd7cf78e9bef269ed482ad8ab572f197ae89af3c
diff --git a/trunk/drivers/bluetooth/dtl1_cs.c b/trunk/drivers/bluetooth/dtl1_cs.c
@@ -550,7 +550,7 @@ static int dtl1_probe(struct pcmcia_device *link)
 	dtl1_info_t *info;
 
 	/* Create new info device */
-	info = kzalloc(sizeof(*info), GFP_KERNEL);
+	info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL);
 	if (!info)
 		return -ENOMEM;
 
@@ -569,7 +569,6 @@ static void dtl1_detach(struct pcmcia_device *link)
 
 	dtl1_close(info);
 	pcmcia_disable_device(link);
-	kfree(info);
 }
 
 static int dtl1_confcheck(struct pcmcia_device *p_dev, void *priv_data)