From ea26d1a695a77bb551d8ff9ffdccf81346a0620b Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Fri, 27 Jul 2012 12:38:33 +0530
Subject: [PATCH] --- yaml --- r: 327487 b: refs/heads/master c:
 1a31c602c3f6de9383eaae28e25859b6304fc3c2 h: refs/heads/master i:   327485:
 8cc2fa90710418069c24e7f756220cdc20eba9c7   327483:
 0d76b9aaca01f32681d677c09160c6d91c6592ca   327479:
 8a2d1d8f03b08c244ef75dd89cdc01e969762a7c   327471:
 e628a9ef0a6bfaba3b1ef9034d3f6da11dbb29e4   327455:
 dd6f2dab931a9acf3cd7b8f047efe3191e48ad85   327423:
 5186ad1aece7ed148ada83636a46f2a4a087844c v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/bluetooth/bluecard_cs.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3e8835efd588..7c87134a22aa 100644
--- 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
index 66c3a6770c41..0c0838d9b56c 100644
--- 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);
 }