summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorRajat Jain <rajatja@google.com>2019-01-29 00:08:09 +0100
committerMarcel Holtmann <marcel@holtmann.org>2019-01-29 16:03:24 +0100
commit2de66bb87351086ce9bef37c1b98d9bae93eddcd (patch)
tree995c7ab6811aca55c02da4c76377f5a7f4c9df80 /drivers/bluetooth
parentBluetooth: btrtl: Restore old logic to assume firmware is already loaded (diff)
downloadlinux-2de66bb87351086ce9bef37c1b98d9bae93eddcd.tar.xz
linux-2de66bb87351086ce9bef37c1b98d9bae93eddcd.zip
Bluetooth: btusb: btusb_intel_cmd_timeout: use sleeping functions
The btusb_intel_cmd_timeout() is called from workqueue contexts, so use the helper functions that can sleep. Signed-off-by: Rajat Jain <rajatja@google.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/btusb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 5de0c2e59b97..9a890b2a7ee1 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -523,9 +523,9 @@ static void btusb_intel_cmd_timeout(struct hci_dev *hdev)
}
bt_dev_err(hdev, "Initiating HW reset via gpio");
- gpiod_set_value(reset_gpio, 1);
- mdelay(100);
- gpiod_set_value(reset_gpio, 0);
+ gpiod_set_value_cansleep(reset_gpio, 1);
+ msleep(100);
+ gpiod_set_value_cansleep(reset_gpio, 0);
}
static inline void btusb_free_frags(struct btusb_data *data)