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

Commit 2ffd7e03 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next



Johan Hedberg says:

====================
pull request: bluetooth-next 2016-05-14

Here are two more Bluetooth patches for the 4.7 kernel which we wanted
to get into net-next before the merge window opens. Please let me know
if there are any issues pulling. Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 14d7e487 72f9f8b5

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3432) },

	{ USB_DEVICE(0x13d3, 0x3472) },

	{ USB_DEVICE(0x13d3, 0x3474) },

	{ USB_DEVICE(0x13d3, 0x3487) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -188,6 +189,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3472), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3474), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3487), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU22 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE036), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3472), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3474), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3487), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },

net/bluetooth/hci_core.c

+2 −2
Original line number Diff line number Diff line
@@ -3139,10 +3139,10 @@ void hci_unregister_dev(struct hci_dev *hdev) 
	list_del(&hdev->list);

	write_unlock(&hci_dev_list_lock);



	hci_dev_do_close(hdev);



	cancel_work_sync(&hdev->power_on);



	hci_dev_do_close(hdev);



	if (!test_bit(HCI_INIT, &hdev->flags) &&

	    !hci_dev_test_flag(hdev, HCI_SETUP) &&

	    !hci_dev_test_flag(hdev, HCI_CONFIG)) {