diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-03-03 16:27:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-03 16:27:23 -0500 |
| commit | aefd3fb26ed28ee21ad658b3f326cd090c111eb3 (patch) | |
| tree | a1f8477105a1cbaea4b1c32e250c7140c9ec8973 /drivers/bluetooth/hci_intel.c | |
| parent | net: relax setup_tc ndo op handle restriction (diff) | |
| parent | Bluetooth: hci_uart: Add diag and address support for Intel/AG6xx (diff) | |
| download | linux-dev-aefd3fb26ed28ee21ad658b3f326cd090c111eb3.tar.xz linux-dev-aefd3fb26ed28ee21ad658b3f326cd090c111eb3.zip | |
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-03-01
Here's our main set of Bluetooth & 802.15.4 patches for the 4.6 kernel.
- New Bluetooth HCI driver for Intel/AG6xx controllers
- New Broadcom ACPI IDs
- LED trigger support for indicating Bluetooth powered state
- Various fixes in mac802154, 6lowpan and related drivers
- New USB IDs for AR3012 Bluetooth controllers
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bluetooth/hci_intel.c')
| -rw-r--r-- | drivers/bluetooth/hci_intel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c index 3d63ea37bd4c..91d605147b10 100644 --- a/drivers/bluetooth/hci_intel.c +++ b/drivers/bluetooth/hci_intel.c @@ -488,7 +488,7 @@ static int intel_set_baudrate(struct hci_uart *hu, unsigned int speed) clear_bit(STATE_BOOTING, &intel->flags); /* In case of timeout, try to continue anyway */ - if (err && err != ETIMEDOUT) + if (err && err != -ETIMEDOUT) return err; bt_dev_info(hdev, "Change controller speed to %d", speed); @@ -581,7 +581,7 @@ static int intel_setup(struct hci_uart *hu) clear_bit(STATE_BOOTING, &intel->flags); /* In case of timeout, try to continue anyway */ - if (err && err != ETIMEDOUT) + if (err && err != -ETIMEDOUT) return err; set_bit(STATE_BOOTLOADER, &intel->flags); |