diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-16 04:59:23 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-16 04:59:23 (GMT) |
| commit | 15afb10df4a3f1bd781373ffd968e70cc4b21a42 (patch) | |
| tree | 1f66e535269ae585b5fc9994d757739060fec98c /drivers | |
| parent | ddf06c1e569a64a44c4c750ae45b2604f19e45f0 (diff) | |
| parent | 7bee8b08c428b63aa4a3765bb907602e36355378 (diff) | |
| download | linux-15afb10df4a3f1bd781373ffd968e70cc4b21a42.tar.xz | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bluetooth/btbcm.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c index 1e1a432..9ceb8ac 100644 --- a/drivers/bluetooth/btbcm.c +++ b/drivers/bluetooth/btbcm.c @@ -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); - - BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name, skb->data[1], - get_unaligned_le16(skb->data + 5)); - kfree_skb(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); |