Merge tag 'devicetree-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

[deliverable/linux.git] / drivers / bluetooth / hci_intel.c

diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c
index 3d63ea37bd4ca683b37c7ea7661be70163b6590c..91d605147b10e45a721941582ac366185afb0da3 100644 (file)
--- 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);