Revert "Bluetooth: Increase HCI reset timeout in hci_dev_do_close"

Gustavo F. Padovan · Gustavo F. Padovan · commit cad44c2bf616 · 2011-12-23T19:00:02.000-02:00
This reverts commit e1b6eb3. 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: Tomáš Janoušek <tomi@nomi.cz> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
@@ -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);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)`
`613`	`613`	`if (!test_bit(HCI_RAW, &hdev->flags)) {`
`614`	`614`	`set_bit(HCI_INIT, &hdev->flags);`
`615`	`615`	`__hci_request(hdev, hci_reset_req, 0,`
`616`		`- msecs_to_jiffies(HCI_INIT_TIMEOUT));`
	`616`	`+ msecs_to_jiffies(250));`
`617`	`617`	`clear_bit(HCI_INIT, &hdev->flags);`
`618`	`618`	`}`
`619`	`619`