diff options
-rw-r--r-- | drivers/bluetooth/hci_usb.c | 10 | ||||
-rw-r--r-- | drivers/bluetooth/hci_usb.h | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index 99a714ac244b..192522ebb771 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c | |||
@@ -265,7 +265,7 @@ static int hci_usb_intr_rx_submit(struct hci_usb *husb) | |||
265 | BT_ERR("%s intr rx submit failed urb %p err %d", | 265 | BT_ERR("%s intr rx submit failed urb %p err %d", |
266 | husb->hdev->name, urb, err); | 266 | husb->hdev->name, urb, err); |
267 | _urb_unlink(_urb); | 267 | _urb_unlink(_urb); |
268 | _urb_free(_urb); | 268 | kfree(_urb); |
269 | kfree(buf); | 269 | kfree(buf); |
270 | } | 270 | } |
271 | return err; | 271 | return err; |
@@ -302,7 +302,7 @@ static int hci_usb_bulk_rx_submit(struct hci_usb *husb) | |||
302 | BT_ERR("%s bulk rx submit failed urb %p err %d", | 302 | BT_ERR("%s bulk rx submit failed urb %p err %d", |
303 | husb->hdev->name, urb, err); | 303 | husb->hdev->name, urb, err); |
304 | _urb_unlink(_urb); | 304 | _urb_unlink(_urb); |
305 | _urb_free(_urb); | 305 | kfree(_urb); |
306 | kfree(buf); | 306 | kfree(buf); |
307 | } | 307 | } |
308 | return err; | 308 | return err; |
@@ -353,7 +353,7 @@ static int hci_usb_isoc_rx_submit(struct hci_usb *husb) | |||
353 | BT_ERR("%s isoc rx submit failed urb %p err %d", | 353 | BT_ERR("%s isoc rx submit failed urb %p err %d", |
354 | husb->hdev->name, urb, err); | 354 | husb->hdev->name, urb, err); |
355 | _urb_unlink(_urb); | 355 | _urb_unlink(_urb); |
356 | _urb_free(_urb); | 356 | kfree(_urb); |
357 | kfree(buf); | 357 | kfree(buf); |
358 | } | 358 | } |
359 | return err; | 359 | return err; |
@@ -431,7 +431,7 @@ static void hci_usb_unlink_urbs(struct hci_usb *husb) | |||
431 | husb->hdev->name, _urb, _urb->type, urb); | 431 | husb->hdev->name, _urb, _urb->type, urb); |
432 | kfree(urb->setup_packet); | 432 | kfree(urb->setup_packet); |
433 | kfree(urb->transfer_buffer); | 433 | kfree(urb->transfer_buffer); |
434 | _urb_free(_urb); | 434 | kfree(_urb); |
435 | } | 435 | } |
436 | } | 436 | } |
437 | } | 437 | } |
@@ -490,7 +490,7 @@ static inline int hci_usb_send_ctrl(struct hci_usb *husb, struct sk_buff *skb) | |||
490 | 490 | ||
491 | dr = kmalloc(sizeof(*dr), GFP_ATOMIC); | 491 | dr = kmalloc(sizeof(*dr), GFP_ATOMIC); |
492 | if (!dr) { | 492 | if (!dr) { |
493 | _urb_free(_urb); | 493 | kfree(_urb); |
494 | return -ENOMEM; | 494 | return -ENOMEM; |
495 | } | 495 | } |
496 | } else | 496 | } else |
diff --git a/drivers/bluetooth/hci_usb.h b/drivers/bluetooth/hci_usb.h index 56cd3a92ceca..414080a4e8ff 100644 --- a/drivers/bluetooth/hci_usb.h +++ b/drivers/bluetooth/hci_usb.h | |||
@@ -60,11 +60,6 @@ struct _urb { | |||
60 | struct urb urb; | 60 | struct urb urb; |
61 | }; | 61 | }; |
62 | 62 | ||
63 | static inline void _urb_free(struct _urb *_urb) | ||
64 | { | ||
65 | kfree(_urb); | ||
66 | } | ||
67 | |||
68 | static inline void _urb_queue_init(struct _urb_queue *q) | 63 | static inline void _urb_queue_init(struct _urb_queue *q) |
69 | { | 64 | { |
70 | INIT_LIST_HEAD(&q->head); | 65 | INIT_LIST_HEAD(&q->head); |