Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth

linvjw · linvjw · commit f9dc73e54134 · 2012-01-03T14:26:56.000-05:00
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`