diff options
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r-- | drivers/bluetooth/bpa10x.c | 1 | ||||
-rw-r--r-- | drivers/bluetooth/btsdio.c | 4 | ||||
-rw-r--r-- | drivers/bluetooth/hci_usb.c | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c index 1375b5345a0a..3b28658f5a1f 100644 --- a/drivers/bluetooth/bpa10x.c +++ b/drivers/bluetooth/bpa10x.c | |||
@@ -423,6 +423,7 @@ static int bpa10x_send_frame(struct sk_buff *skb) | |||
423 | break; | 423 | break; |
424 | 424 | ||
425 | default: | 425 | default: |
426 | usb_free_urb(urb); | ||
426 | return -EILSEQ; | 427 | return -EILSEQ; |
427 | } | 428 | } |
428 | 429 | ||
diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c index b786f6187902..58630cc1eff2 100644 --- a/drivers/bluetooth/btsdio.c +++ b/drivers/bluetooth/btsdio.c | |||
@@ -162,10 +162,8 @@ static int btsdio_rx_packet(struct btsdio_data *data) | |||
162 | bt_cb(skb)->pkt_type = hdr[3]; | 162 | bt_cb(skb)->pkt_type = hdr[3]; |
163 | 163 | ||
164 | err = hci_recv_frame(skb); | 164 | err = hci_recv_frame(skb); |
165 | if (err < 0) { | 165 | if (err < 0) |
166 | kfree(skb); | ||
167 | return err; | 166 | return err; |
168 | } | ||
169 | 167 | ||
170 | sdio_writeb(data->func, 0x00, REG_PC_RRT, NULL); | 168 | sdio_writeb(data->func, 0x00, REG_PC_RRT, NULL); |
171 | 169 | ||
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index 98a9cdeaffb6..372c7ef633da 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c | |||
@@ -111,6 +111,7 @@ static struct usb_device_id blacklist_ids[] = { | |||
111 | { USB_DEVICE(0x0a5c, 0x2033), .driver_info = HCI_IGNORE }, | 111 | { USB_DEVICE(0x0a5c, 0x2033), .driver_info = HCI_IGNORE }, |
112 | 112 | ||
113 | /* Broadcom BCM2035 */ | 113 | /* Broadcom BCM2035 */ |
114 | { USB_DEVICE(0x0a5c, 0x2035), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU }, | ||
114 | { USB_DEVICE(0x0a5c, 0x200a), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU }, | 115 | { USB_DEVICE(0x0a5c, 0x200a), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU }, |
115 | { USB_DEVICE(0x0a5c, 0x2009), .driver_info = HCI_BCM92035 }, | 116 | { USB_DEVICE(0x0a5c, 0x2009), .driver_info = HCI_BCM92035 }, |
116 | 117 | ||