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

Commit 15afb10d authored by David S. Miller's avatar David S. Miller
Browse files

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



Johan Hedberg says:

====================
pull request: bluetooth 2015-07-15

Here's a regression fix for Broadcom Bluetooth adapters found at least
in certain Apple laptops. The issue was introduced in 4.1 so there's the
appropriate "Cc: stable" entry for it.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ddf06c1e 7bee8b08

drivers/bluetooth/btbcm.c

+5 −6
Original line number Diff line number Diff line
@@ -472,12 +472,11 @@ int btbcm_setup_apple(struct hci_dev *hdev) 


	/* Read Verbose Config Version Info */

	skb = btbcm_read_verbose_config(hdev);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	if (!IS_ERR(skb)) {

		BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name, skb->data[1],

			get_unaligned_le16(skb->data + 5));

		kfree_skb(skb);

	}



	set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);