From: Anton Protopopov Date: Wed, 10 Feb 2016 17:22:54 +0000 (-0500) Subject: Bluetooth: hci_intel: Fix a wrong comparison X-Git-Tag: v4.6-rc1~91^2~138^2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2be1149ed40812ab75bc1af67a68f5d09e8be762;p=thirdparty%2Fkernel%2Flinux.git Bluetooth: hci_intel: Fix a wrong comparison A return value of the intel_wait_booting() function compared with a constant ETIMEDOUT instead of -ETIMEDOUT. Signed-off-by: Anton Protopopov Signed-off-by: Marcel Holtmann --- diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c index 3d63ea37bd4ca..91d605147b10e 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);