diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2012-07-27 03:08:34 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-08-06 14:03:01 -0400 |
commit | 704687ce17bf00f557f300e5bcf6c3bdd1f78226 (patch) | |
tree | f02dcdf620ccab2cfb984e7594e57ef9e6908eb9 | |
parent | 1a31c602c3f6de9383eaae28e25859b6304fc3c2 (diff) |
Bluetooth: Use devm_kzalloc in bpa10x.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>
-rw-r--r-- | drivers/bluetooth/bpa10x.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c index 29caaed2d715..2fe4a8031348 100644 --- a/drivers/bluetooth/bpa10x.c +++ b/drivers/bluetooth/bpa10x.c | |||
@@ -443,7 +443,7 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id * | |||
443 | if (intf->cur_altsetting->desc.bInterfaceNumber != 0) | 443 | if (intf->cur_altsetting->desc.bInterfaceNumber != 0) |
444 | return -ENODEV; | 444 | return -ENODEV; |
445 | 445 | ||
446 | data = kzalloc(sizeof(*data), GFP_KERNEL); | 446 | data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL); |
447 | if (!data) | 447 | if (!data) |
448 | return -ENOMEM; | 448 | return -ENOMEM; |
449 | 449 | ||
@@ -453,10 +453,8 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id * | |||
453 | init_usb_anchor(&data->rx_anchor); | 453 | init_usb_anchor(&data->rx_anchor); |
454 | 454 | ||
455 | hdev = hci_alloc_dev(); | 455 | hdev = hci_alloc_dev(); |
456 | if (!hdev) { | 456 | if (!hdev) |
457 | kfree(data); | ||
458 | return -ENOMEM; | 457 | return -ENOMEM; |
459 | } | ||
460 | 458 | ||
461 | hdev->bus = HCI_USB; | 459 | hdev->bus = HCI_USB; |
462 | hci_set_drvdata(hdev, data); | 460 | hci_set_drvdata(hdev, data); |
@@ -475,7 +473,6 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id * | |||
475 | err = hci_register_dev(hdev); | 473 | err = hci_register_dev(hdev); |
476 | if (err < 0) { | 474 | if (err < 0) { |
477 | hci_free_dev(hdev); | 475 | hci_free_dev(hdev); |
478 | kfree(data); | ||
479 | return err; | 476 | return err; |
480 | } | 477 | } |
481 | 478 | ||
@@ -500,7 +497,6 @@ static void bpa10x_disconnect(struct usb_interface *intf) | |||
500 | hci_free_dev(data->hdev); | 497 | hci_free_dev(data->hdev); |
501 | kfree_skb(data->rx_skb[0]); | 498 | kfree_skb(data->rx_skb[0]); |
502 | kfree_skb(data->rx_skb[1]); | 499 | kfree_skb(data->rx_skb[1]); |
503 | kfree(data); | ||
504 | } | 500 | } |
505 | 501 | ||
506 | static struct usb_driver bpa10x_driver = { | 502 | static struct usb_driver bpa10x_driver = { |