Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 742201e7 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 53240c20 1305e9e7

drivers/bluetooth/bpa10x.c

+0 −2
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ static inline int bpa10x_submit_intr_urb(struct hci_dev *hdev) 
		BT_ERR("%s urb %p submission failed (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);

		kfree(buf);

	}



	usb_free_urb(urb);
@@ -298,7 +297,6 @@ static inline int bpa10x_submit_bulk_urb(struct hci_dev *hdev) 
		BT_ERR("%s urb %p submission failed (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);

		kfree(buf);

	}



	usb_free_urb(urb);

drivers/bluetooth/btusb.c

+5 −3
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0a5c, 0x2101), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },



	/* Broadcom BCM2046 */

	{ USB_DEVICE(0x0a5c, 0x2146), .driver_info = BTUSB_RESET },

	{ USB_DEVICE(0x0a5c, 0x2151), .driver_info = BTUSB_RESET },



	/* Apple MacBook Pro with Broadcom chip */
@@ -113,6 +114,7 @@ static struct usb_device_id blacklist_table[] = { 


	/* Targus ACB10US */

	{ USB_DEVICE(0x0a5c, 0x2100), .driver_info = BTUSB_RESET },

	{ USB_DEVICE(0x0a5c, 0x2154), .driver_info = BTUSB_RESET },



	/* ANYCOM Bluetooth USB-200 and USB-250 */

	{ USB_DEVICE(0x0a5c, 0x2111), .driver_info = BTUSB_RESET },
@@ -150,6 +152,9 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x050d, 0x0012), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },

	{ USB_DEVICE(0x050d, 0x0013), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },



	/* Belkin F8T016 device */

	{ USB_DEVICE(0x050d, 0x016a), .driver_info = BTUSB_RESET },



	/* Digianswer devices */

	{ USB_DEVICE(0x08fd, 0x0001), .driver_info = BTUSB_DIGIANSWER },

	{ USB_DEVICE(0x08fd, 0x0002), .driver_info = BTUSB_IGNORE },
@@ -271,7 +276,6 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev) 
		BT_ERR("%s urb %p submission failed (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);

		kfree(buf);

	}



	usb_free_urb(urb);
@@ -354,7 +358,6 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev) 
		BT_ERR("%s urb %p submission failed (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);

		kfree(buf);

	}



	usb_free_urb(urb);
@@ -475,7 +478,6 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev) 
		BT_ERR("%s urb %p submission failed (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);

		kfree(buf);

	}



	usb_free_urb(urb);