From c6f2f2cd20c99bed732fe95f1ed0e927855917cb Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Fri, 27 Jul 2012 12:38:37 +0530 Subject: [PATCH] --- yaml --- r: 327491 b: refs/heads/master c: 3a382772b51bbf55b23701746102bd75b9fe883f h: refs/heads/master i: 327489: 0d4f5339b8bbb453f72dc2e9ce8f434fcfa1583a 327487: ea26d1a695a77bb551d8ff9ffdccf81346a0620b v: v3 --- [refs] | 2 +- trunk/drivers/bluetooth/btsdio.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ff2ea7f19af3..0e01612d9fc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb17ea3b1ce6302e7416c4ba58754fd70ee3ab62 +refs/heads/master: 3a382772b51bbf55b23701746102bd75b9fe883f diff --git a/trunk/drivers/bluetooth/btsdio.c b/trunk/drivers/bluetooth/btsdio.c index e10ea0347051..4a9909713874 100644 --- a/trunk/drivers/bluetooth/btsdio.c +++ b/trunk/drivers/bluetooth/btsdio.c @@ -304,7 +304,7 @@ static int btsdio_probe(struct sdio_func *func, tuple = tuple->next; } - data = kzalloc(sizeof(*data), GFP_KERNEL); + data = devm_kzalloc(&func->dev, sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; @@ -315,10 +315,8 @@ static int btsdio_probe(struct sdio_func *func, skb_queue_head_init(&data->txq); hdev = hci_alloc_dev(); - if (!hdev) { - kfree(data); + if (!hdev) return -ENOMEM; - } hdev->bus = HCI_SDIO; hci_set_drvdata(hdev, data); @@ -340,7 +338,6 @@ static int btsdio_probe(struct sdio_func *func, err = hci_register_dev(hdev); if (err < 0) { hci_free_dev(hdev); - kfree(data); return err; } @@ -366,7 +363,6 @@ static void btsdio_remove(struct sdio_func *func) hci_unregister_dev(hdev); hci_free_dev(hdev); - kfree(data); } static struct sdio_driver btsdio_driver = {