Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cad44c2b authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Revert "Bluetooth: Increase HCI reset timeout in hci_dev_do_close" 



This reverts commit e1b6eb3c.

This was causing a delay of 10 seconds in the resume process of a Thinkpad
laptop. I'm afraid this could affect more devices once 3.2 is released.

Reported-by: default avatarTomáš Janoušek <tomi@nomi.cz>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent d7660918

net/bluetooth/hci_core.c

+1 −1
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) 
	if (!test_bit(HCI_RAW, &hdev->flags)) {

		set_bit(HCI_INIT, &hdev->flags);

		__hci_request(hdev, hci_reset_req, 0,

					msecs_to_jiffies(HCI_INIT_TIMEOUT));

					msecs_to_jiffies(250));

		clear_bit(HCI_INIT, &hdev->flags);

	}