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

Commit 485f2b7f authored by John W. Linville's avatar John W. Linville
Browse files

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

parents e734207f 482049f7

drivers/bluetooth/ath3k.c

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ static struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3304) },

	{ USB_DEVICE(0x0930, 0x0215) },

	{ USB_DEVICE(0x0489, 0xE03D) },

	{ USB_DEVICE(0x0489, 0xE027) },



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03F0, 0x311D) },

drivers/bluetooth/btusb.c

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

	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },

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

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



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },

net/bluetooth/hci_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1754,11 +1754,11 @@ int hci_register_dev(struct hci_dev *hdev) 
	if (hdev->dev_type != HCI_AMP)

		set_bit(HCI_AUTO_OFF, &hdev->dev_flags);



	schedule_work(&hdev->power_on);



	hci_notify(hdev, HCI_DEV_REG);

	hci_dev_hold(hdev);



	schedule_work(&hdev->power_on);



	return id;



err_wqueue:

net/bluetooth/mgmt.c

+7 −5
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static int read_index_list(struct sock *sk, struct hci_dev *hdev, void *data, 
	struct hci_dev *d;

	size_t rp_len;

	u16 count;

	int i, err;

	int err;



	BT_DBG("sock %p", sk);
@@ -347,9 +347,7 @@ static int read_index_list(struct sock *sk, struct hci_dev *hdev, void *data, 
		return -ENOMEM;

	}



	rp->num_controllers = cpu_to_le16(count);



	i = 0;

	count = 0;

	list_for_each_entry(d, &hci_dev_list, list) {

		if (test_bit(HCI_SETUP, &d->dev_flags))

			continue;
@@ -357,10 +355,13 @@ static int read_index_list(struct sock *sk, struct hci_dev *hdev, void *data, 
		if (!mgmt_valid_hdev(d))

			continue;



		rp->index[i++] = cpu_to_le16(d->id);

		rp->index[count++] = cpu_to_le16(d->id);

		BT_DBG("Added hci%u", d->id);

	}



	rp->num_controllers = cpu_to_le16(count);

	rp_len = sizeof(*rp) + (2 * count);



	read_unlock(&hci_dev_list_lock);



	err = cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_INDEX_LIST, 0, rp,
@@ -1366,6 +1367,7 @@ static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data, 
			continue;



		list_del(&match->list);

		kfree(match);

		found++;

	}

net/bluetooth/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static void smp_failure(struct l2cap_conn *conn, u8 reason, u8 send) 


	clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->hcon->flags);

	mgmt_auth_failed(conn->hcon->hdev, conn->dst, hcon->type,

			 hcon->dst_type, reason);

			 hcon->dst_type, HCI_ERROR_AUTH_FAILURE);



	cancel_delayed_work_sync(&conn->security_timer);