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

Commit f9dc73e5 authored by John W. Linville's avatar John W. Linville
Browse files

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

parents 96f1f05a cad44c2b

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);

	}