diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/bluetooth/bluecard_cs.c | 2 | ||||
-rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 3 | ||||
-rw-r--r-- | drivers/bluetooth/btuart_cs.c | 2 | ||||
-rw-r--r-- | drivers/bluetooth/btusb.c | 3 | ||||
-rw-r--r-- | drivers/bluetooth/btwilink.c | 16 | ||||
-rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 2 | ||||
-rw-r--r-- | drivers/bluetooth/hci_ll.c | 2 | ||||
-rw-r--r-- | drivers/bluetooth/hci_vhci.c | 2 |
8 files changed, 9 insertions, 23 deletions
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index 0c0838d9b56c..0d26851d6e49 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c | |||
@@ -681,7 +681,7 @@ static int bluecard_hci_send_frame(struct sk_buff *skb) | |||
681 | case HCI_SCODATA_PKT: | 681 | case HCI_SCODATA_PKT: |
682 | hdev->stat.sco_tx++; | 682 | hdev->stat.sco_tx++; |
683 | break; | 683 | break; |
684 | }; | 684 | } |
685 | 685 | ||
686 | /* Prepend skb with frame type */ | 686 | /* Prepend skb with frame type */ |
687 | memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1); | 687 | memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1); |
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 03b3acba6143..3f4bfc814dc7 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c | |||
@@ -600,8 +600,7 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv) | |||
600 | exit: | 600 | exit: |
601 | if (ret) { | 601 | if (ret) { |
602 | hdev->stat.err_rx++; | 602 | hdev->stat.err_rx++; |
603 | if (skb) | 603 | kfree_skb(skb); |
604 | kfree_skb(skb); | ||
605 | } | 604 | } |
606 | 605 | ||
607 | return ret; | 606 | return ret; |
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index 2f510a87b28f..35a553a90616 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
@@ -446,7 +446,7 @@ static int btuart_hci_send_frame(struct sk_buff *skb) | |||
446 | case HCI_SCODATA_PKT: | 446 | case HCI_SCODATA_PKT: |
447 | hdev->stat.sco_tx++; | 447 | hdev->stat.sco_tx++; |
448 | break; | 448 | break; |
449 | }; | 449 | } |
450 | 450 | ||
451 | /* Prepend skb with frame type */ | 451 | /* Prepend skb with frame type */ |
452 | memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1); | 452 | memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1); |
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index e5921d681ddb..debda27df9b0 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
@@ -96,11 +96,12 @@ static struct usb_device_id btusb_table[] = { | |||
96 | { USB_DEVICE(0x0c10, 0x0000) }, | 96 | { USB_DEVICE(0x0c10, 0x0000) }, |
97 | 97 | ||
98 | /* Broadcom BCM20702A0 */ | 98 | /* Broadcom BCM20702A0 */ |
99 | { USB_DEVICE(0x04ca, 0x2003) }, | ||
99 | { USB_DEVICE(0x0489, 0xe042) }, | 100 | { USB_DEVICE(0x0489, 0xe042) }, |
100 | { USB_DEVICE(0x413c, 0x8197) }, | 101 | { USB_DEVICE(0x413c, 0x8197) }, |
101 | 102 | ||
102 | /* Foxconn - Hon Hai */ | 103 | /* Foxconn - Hon Hai */ |
103 | { USB_DEVICE(0x0489, 0xe033) }, | 104 | { USB_VENDOR_AND_INTERFACE_INFO(0x0489, 0xff, 0x01, 0x01) }, |
104 | 105 | ||
105 | /*Broadcom devices with vendor specific id */ | 106 | /*Broadcom devices with vendor specific id */ |
106 | { USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) }, | 107 | { USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) }, |
diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c index 4ad7b35cfc0e..60abf596f60e 100644 --- a/drivers/bluetooth/btwilink.c +++ b/drivers/bluetooth/btwilink.c | |||
@@ -358,21 +358,7 @@ static struct platform_driver btwilink_driver = { | |||
358 | }, | 358 | }, |
359 | }; | 359 | }; |
360 | 360 | ||
361 | /* ------- Module Init/Exit interfaces ------ */ | 361 | module_platform_driver(btwilink_driver); |
362 | static int __init btwilink_init(void) | ||
363 | { | ||
364 | BT_INFO("Bluetooth Driver for TI WiLink - Version %s", VERSION); | ||
365 | |||
366 | return platform_driver_register(&btwilink_driver); | ||
367 | } | ||
368 | |||
369 | static void __exit btwilink_exit(void) | ||
370 | { | ||
371 | platform_driver_unregister(&btwilink_driver); | ||
372 | } | ||
373 | |||
374 | module_init(btwilink_init); | ||
375 | module_exit(btwilink_exit); | ||
376 | 362 | ||
377 | /* ------ Module Info ------ */ | 363 | /* ------ Module Info ------ */ |
378 | 364 | ||
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 74e0966b3ead..c8abce3d2d9c 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c | |||
@@ -531,7 +531,7 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file * file, | |||
531 | default: | 531 | default: |
532 | err = n_tty_ioctl_helper(tty, file, cmd, arg); | 532 | err = n_tty_ioctl_helper(tty, file, cmd, arg); |
533 | break; | 533 | break; |
534 | }; | 534 | } |
535 | 535 | ||
536 | return err; | 536 | return err; |
537 | } | 537 | } |
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c index ff6d589c34a5..cfc767938589 100644 --- a/drivers/bluetooth/hci_ll.c +++ b/drivers/bluetooth/hci_ll.c | |||
@@ -481,7 +481,7 @@ static int ll_recv(struct hci_uart *hu, void *data, int count) | |||
481 | hu->hdev->stat.err_rx++; | 481 | hu->hdev->stat.err_rx++; |
482 | ptr++; count--; | 482 | ptr++; count--; |
483 | continue; | 483 | continue; |
484 | }; | 484 | } |
485 | 485 | ||
486 | ptr++; count--; | 486 | ptr++; count--; |
487 | 487 | ||
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c index 3f72595a6017..d8b7aed6e4a9 100644 --- a/drivers/bluetooth/hci_vhci.c +++ b/drivers/bluetooth/hci_vhci.c | |||
@@ -156,7 +156,7 @@ static inline ssize_t vhci_put_user(struct vhci_data *data, | |||
156 | case HCI_SCODATA_PKT: | 156 | case HCI_SCODATA_PKT: |
157 | data->hdev->stat.sco_tx++; | 157 | data->hdev->stat.sco_tx++; |
158 | break; | 158 | break; |
159 | }; | 159 | } |
160 | 160 | ||
161 | return total; | 161 | return total; |
162 | } | 162 | } |