Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 742201e7baf66c64995fdd033d706220e6208fab

Authored by David S. Miller
2 parents 53240c2087 1305e9e799
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

Showing 2 changed files Side-by-side Diff

drivers/bluetooth/bpa10x.c
Diff comments   View file @ 742201e
... ... @@ -256,7 +256,6 @@
256 256 BT_ERR("%s urb %p submission failed (%d)",
257 257 hdev->name, urb, -err);
258 258 usb_unanchor_urb(urb);
259   - kfree(buf);
260 259 }
261 260  
262 261 usb_free_urb(urb);
... ... @@ -298,7 +297,6 @@
298 297 BT_ERR("%s urb %p submission failed (%d)",
299 298 hdev->name, urb, -err);
300 299 usb_unanchor_urb(urb);
301   - kfree(buf);
302 300 }
303 301  
304 302 usb_free_urb(urb);
drivers/bluetooth/btusb.c
Diff comments   View file @ 742201e
... ... @@ -102,6 +102,7 @@
102 102 { USB_DEVICE(0x0a5c, 0x2101), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
103 103  
104 104 /* Broadcom BCM2046 */
  105 + { USB_DEVICE(0x0a5c, 0x2146), .driver_info = BTUSB_RESET },
105 106 { USB_DEVICE(0x0a5c, 0x2151), .driver_info = BTUSB_RESET },
106 107  
107 108 /* Apple MacBook Pro with Broadcom chip */
... ... @@ -113,6 +114,7 @@
113 114  
114 115 /* Targus ACB10US */
115 116 { USB_DEVICE(0x0a5c, 0x2100), .driver_info = BTUSB_RESET },
  117 + { USB_DEVICE(0x0a5c, 0x2154), .driver_info = BTUSB_RESET },
116 118  
117 119 /* ANYCOM Bluetooth USB-200 and USB-250 */
118 120 { USB_DEVICE(0x0a5c, 0x2111), .driver_info = BTUSB_RESET },
... ... @@ -150,6 +152,9 @@
150 152 { USB_DEVICE(0x050d, 0x0012), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
151 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 158 /* Digianswer devices */
154 159 { USB_DEVICE(0x08fd, 0x0001), .driver_info = BTUSB_DIGIANSWER },
155 160 { USB_DEVICE(0x08fd, 0x0002), .driver_info = BTUSB_IGNORE },
... ... @@ -271,7 +276,6 @@
271 276 BT_ERR("%s urb %p submission failed (%d)",
272 277 hdev->name, urb, -err);
273 278 usb_unanchor_urb(urb);
274   - kfree(buf);
275 279 }
276 280  
277 281 usb_free_urb(urb);
... ... @@ -354,7 +358,6 @@
354 358 BT_ERR("%s urb %p submission failed (%d)",
355 359 hdev->name, urb, -err);
356 360 usb_unanchor_urb(urb);
357   - kfree(buf);
358 361 }
359 362  
360 363 usb_free_urb(urb);
... ... @@ -475,7 +478,6 @@
475 478 BT_ERR("%s urb %p submission failed (%d)",
476 479 hdev->name, urb, -err);
477 480 usb_unanchor_urb(urb);
478   - kfree(buf);
479 481 }
480 482  
481 483 usb_free_urb(urb);