The following commit has been merged in the batman-adv/next branch: commit 3a382772b51bbf55b23701746102bd75b9fe883f Author: Sachin Kamat sachin.kamat@linaro.org Date: Fri Jul 27 12:38:37 2012 +0530

Bluetooth: Use devm_kzalloc in btsdio.c file

devm_kzalloc() eliminates the need to free memory explicitly thereby saving some cleanup code.

Signed-off-by: Sachin Kamat sachin.kamat@linaro.org Acked-by: Marcel Holtmann marcel@holtmann.org Signed-off-by: Gustavo Padovan gustavo.padovan@collabora.co.uk

diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c index e10ea03..4a99097 100644 --- a/drivers/bluetooth/btsdio.c +++ b/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 = {