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

Bluetooth: Use devm_kzalloc in bluecard_cs.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/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index 66c3a67..0c0838d 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/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); }