Commit f8680f12 authored Jun 10, 2014 by Johan Hedberg Committed by Marcel Holtmann Jun 13, 2014

Bluetooth: Reuse hci_stop_discovery function when cleaning up HCI state



When cleaning up the HCI state as part of the power-off procedure we can
reuse the hci_stop_discovery() function instead of explicitly sending
HCI command related to discovery. The added benefit of this is that it
takes care of canceling name resolving and inquiry which were not
previously covered by the code.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org

parent 21a60d30

net/bluetooth/mgmt.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1100,9 +1100,7 @@ static int clean_up_hci_state(struct hci_dev *hdev)
		if (test_bit(HCI_ADVERTISING, &hdev->dev_flags))
		disable_advertising(&req);

		if (test_bit(HCI_LE_SCAN, &hdev->dev_flags)) {
		hci_req_add_le_scan_disable(&req);
		}
		hci_stop_discovery(&req);

		list_for_each_entry(conn, &hdev->conn_hash.list, list) {
		struct hci_cp_disconnect dc;

Admin message