Commit 7bee8b08 authored Jul 14, 2015 by Chris Mason Committed by Marcel Holtmann Jul 14, 2015

Bluetooth: btbcm: allow btbcm_read_verbose_config to fail on Apple



Commit 1c8ba6d0 moved around the setup code for broadcomm chips,
and also added btbcm_read_verbose_config() to read extra information
about the hardware.  It's returning errors on some macbooks:

Bluetooth: hci0: BCM: Read verbose config info failed (-16)

Which makes us error out of the setup function.  Since this
probe isn't critical to operate the chip, this patch just changes
things to carry on when it fails.

Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org # v4.1

parent f760b87f

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);