From 0d4f5339b8bbb453f72dc2e9ce8f434fcfa1583a Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Fri, 27 Jul 2012 12:38:35 +0530 Subject: [PATCH] --- yaml --- r: 327489 b: refs/heads/master c: 4f61cb184fd5d16d591303aacf8dd1e623d2137d h: refs/heads/master i: 327487: ea26d1a695a77bb551d8ff9ffdccf81346a0620b v: v3 --- [refs] | 2 +- trunk/drivers/bluetooth/bt3c_cs.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d511a4f9de9a..cdff6d952101 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 704687ce17bf00f557f300e5bcf6c3bdd1f78226 +refs/heads/master: 4f61cb184fd5d16d591303aacf8dd1e623d2137d diff --git a/trunk/drivers/bluetooth/bt3c_cs.c b/trunk/drivers/bluetooth/bt3c_cs.c index 8925b6d672a6..7ffd3f407144 100644 --- a/trunk/drivers/bluetooth/bt3c_cs.c +++ b/trunk/drivers/bluetooth/bt3c_cs.c @@ -638,7 +638,7 @@ static int bt3c_probe(struct pcmcia_device *link) bt3c_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; @@ -654,10 +654,7 @@ static int bt3c_probe(struct pcmcia_device *link) static void bt3c_detach(struct pcmcia_device *link) { - bt3c_info_t *info = link->priv; - bt3c_release(link); - kfree(info); } static int bt3c_check_config(struct pcmcia_device *p_dev, void *priv_data)