diff options
Diffstat (limited to 'drivers/bluetooth/btusb.c')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 8 | 
1 files changed, 5 insertions, 3 deletions
| diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 29ae99817c60..af472e052732 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
| @@ -102,6 +102,7 @@ static struct usb_device_id blacklist_table[] = { | |||
| 102 | { USB_DEVICE(0x0a5c, 0x2101), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU }, | 102 | { USB_DEVICE(0x0a5c, 0x2101), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU }, | 
| 103 | 103 | ||
| 104 | /* Broadcom BCM2046 */ | 104 | /* Broadcom BCM2046 */ | 
| 105 | { USB_DEVICE(0x0a5c, 0x2146), .driver_info = BTUSB_RESET }, | ||
| 105 | { USB_DEVICE(0x0a5c, 0x2151), .driver_info = BTUSB_RESET }, | 106 | { USB_DEVICE(0x0a5c, 0x2151), .driver_info = BTUSB_RESET }, | 
| 106 | 107 | ||
| 107 | /* Apple MacBook Pro with Broadcom chip */ | 108 | /* Apple MacBook Pro with Broadcom chip */ | 
| @@ -113,6 +114,7 @@ static struct usb_device_id blacklist_table[] = { | |||
| 113 | 114 | ||
| 114 | /* Targus ACB10US */ | 115 | /* Targus ACB10US */ | 
| 115 | { USB_DEVICE(0x0a5c, 0x2100), .driver_info = BTUSB_RESET }, | 116 | { USB_DEVICE(0x0a5c, 0x2100), .driver_info = BTUSB_RESET }, | 
| 117 | { USB_DEVICE(0x0a5c, 0x2154), .driver_info = BTUSB_RESET }, | ||
| 116 | 118 | ||
| 117 | /* ANYCOM Bluetooth USB-200 and USB-250 */ | 119 | /* ANYCOM Bluetooth USB-200 and USB-250 */ | 
| 118 | { USB_DEVICE(0x0a5c, 0x2111), .driver_info = BTUSB_RESET }, | 120 | { USB_DEVICE(0x0a5c, 0x2111), .driver_info = BTUSB_RESET }, | 
| @@ -150,6 +152,9 @@ static struct usb_device_id blacklist_table[] = { | |||
| 150 | { USB_DEVICE(0x050d, 0x0012), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU }, | 152 | { USB_DEVICE(0x050d, 0x0012), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU }, | 
| 151 | { USB_DEVICE(0x050d, 0x0013), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU }, | 153 | { USB_DEVICE(0x050d, 0x0013), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU }, | 
| 152 | 154 | ||
| 155 | /* Belkin F8T016 device */ | ||
| 156 | { USB_DEVICE(0x050d, 0x016a), .driver_info = BTUSB_RESET }, | ||
| 157 | |||
| 153 | /* Digianswer devices */ | 158 | /* Digianswer devices */ | 
| 154 | { USB_DEVICE(0x08fd, 0x0001), .driver_info = BTUSB_DIGIANSWER }, | 159 | { USB_DEVICE(0x08fd, 0x0001), .driver_info = BTUSB_DIGIANSWER }, | 
| 155 | { USB_DEVICE(0x08fd, 0x0002), .driver_info = BTUSB_IGNORE }, | 160 | { USB_DEVICE(0x08fd, 0x0002), .driver_info = BTUSB_IGNORE }, | 
| @@ -271,7 +276,6 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev) | |||
| 271 | BT_ERR("%s urb %p submission failed (%d)", | 276 | BT_ERR("%s urb %p submission failed (%d)", | 
| 272 | hdev->name, urb, -err); | 277 | hdev->name, urb, -err); | 
| 273 | usb_unanchor_urb(urb); | 278 | usb_unanchor_urb(urb); | 
| 274 | kfree(buf); | ||
| 275 | } | 279 | } | 
| 276 | 280 | ||
| 277 | usb_free_urb(urb); | 281 | usb_free_urb(urb); | 
| @@ -354,7 +358,6 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev) | |||
| 354 | BT_ERR("%s urb %p submission failed (%d)", | 358 | BT_ERR("%s urb %p submission failed (%d)", | 
| 355 | hdev->name, urb, -err); | 359 | hdev->name, urb, -err); | 
| 356 | usb_unanchor_urb(urb); | 360 | usb_unanchor_urb(urb); | 
| 357 | kfree(buf); | ||
| 358 | } | 361 | } | 
| 359 | 362 | ||
| 360 | usb_free_urb(urb); | 363 | usb_free_urb(urb); | 
| @@ -475,7 +478,6 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev) | |||
| 475 | BT_ERR("%s urb %p submission failed (%d)", | 478 | BT_ERR("%s urb %p submission failed (%d)", | 
| 476 | hdev->name, urb, -err); | 479 | hdev->name, urb, -err); | 
| 477 | usb_unanchor_urb(urb); | 480 | usb_unanchor_urb(urb); | 
| 478 | kfree(buf); | ||
| 479 | } | 481 | } | 
| 480 | 482 | ||
| 481 | usb_free_urb(urb); | 483 | usb_free_urb(urb); | 
