Bluetooth: hci_intel: Use shorter timeout for HCI commands

Use the standard HCI_CMD_TIMEOUT(1s) for HCI command instead of
HCI_INIT_TIMEOUT(10s) which is not justified in these cases.

Signed-off-by: Loic Poulain <loic.poulain@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c
index 69760e2850d96b1281833e2cfaf61dea95f022c5..3c28c4a6f380f9eac359e1a94428fb0140b06728 100644 (file)
--- a/drivers/bluetooth/hci_intel.c
+++ b/drivers/bluetooth/hci_intel.c
@@ -502,7 +502,7 @@ static int intel_set_baudrate(struct hci_uart *hu, unsigned int speed)
        /* Device will not accept speed change if Intel version has not been
         * previously requested.
         */
-       skb = __hci_cmd_sync(hdev, 0xfc05, 0, NULL, HCI_INIT_TIMEOUT);
+       skb = __hci_cmd_sync(hdev, 0xfc05, 0, NULL, HCI_CMD_TIMEOUT);
        if (IS_ERR(skb)) {
                bt_dev_err(hdev, "Reading Intel version information failed (%ld)",
                           PTR_ERR(skb));
@@ -590,7 +590,7 @@ static int intel_setup(struct hci_uart *hu)
         * is in bootloader mode or if it already has operational firmware
         * loaded.
         */
-       skb = __hci_cmd_sync(hdev, 0xfc05, 0, NULL, HCI_INIT_TIMEOUT);
+       skb = __hci_cmd_sync(hdev, 0xfc05, 0, NULL, HCI_CMD_TIMEOUT);
        if (IS_ERR(skb)) {
                bt_dev_err(hdev, "Reading Intel version information failed (%ld)",
                           PTR_ERR(skb));
@@ -671,7 +671,7 @@ static int intel_setup(struct hci_uart *hu)
        /* Read the secure boot parameters to identify the operating
         * details of the bootloader.
         */
-       skb = __hci_cmd_sync(hdev, 0xfc0d, 0, NULL, HCI_INIT_TIMEOUT);
+       skb = __hci_cmd_sync(hdev, 0xfc0d, 0, NULL, HCI_CMD_TIMEOUT);
        if (IS_ERR(skb)) {
                bt_dev_err(hdev, "Reading Intel boot parameters failed (%ld)",
                           PTR_ERR(skb));
@@ -881,7 +881,7 @@ done:
        set_bit(STATE_BOOTING, &intel->flags);
 
        skb = __hci_cmd_sync(hdev, 0xfc01, sizeof(reset_param), reset_param,
-                            HCI_INIT_TIMEOUT);
+                            HCI_CMD_TIMEOUT);
        if (IS_ERR(skb))
                return PTR_ERR(skb);