---

yaml --- r: 327487 b: refs/heads/master c: 1a31c60 h: refs/heads/master i: 327485: 8cc2fa9 327483: 0d76b9a 327479: 8a2d1d8 327471: e628a9e 327455: dd6f2da 327423: 5186ad1 v: v3
git-mirror · Aug 6, 2012 · ea26d1a · ea26d1a
1 parent ec29a56
commit ea26d1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0213cd8d5ed9cee1d7ffd95566319af1bb36a604
+refs/heads/master: 1a31c602c3f6de9383eaae28e25859b6304fc3c2
diff --git a/trunk/drivers/bluetooth/bluecard_cs.c b/trunk/drivers/bluetooth/bluecard_cs.c
@@ -849,7 +849,7 @@ static int bluecard_probe(struct pcmcia_device *link)
 	bluecard_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;
 
@@ -864,10 +864,7 @@ static int bluecard_probe(struct pcmcia_device *link)
 
 static void bluecard_detach(struct pcmcia_device *link)
 {
-	bluecard_info_t *info = link->priv;
-
 	bluecard_release(link);
-	kfree(info);
 }