|
@@ -2854,9 +2854,11 @@ static void le_scan_disable_work_complete(struct hci_dev *hdev, u8 status,
|
|
|
* state. If we were running both LE and BR/EDR inquiry
|
|
|
* simultaneously, and BR/EDR inquiry is already
|
|
|
* finished, stop discovery, otherwise BR/EDR inquiry
|
|
|
- * will stop discovery when finished.
|
|
|
+ * will stop discovery when finished. If we will resolve
|
|
|
+ * remote device name, do not change discovery state.
|
|
|
*/
|
|
|
- if (!test_bit(HCI_INQUIRY, &hdev->flags))
|
|
|
+ if (!test_bit(HCI_INQUIRY, &hdev->flags) &&
|
|
|
+ hdev->discovery.state != DISCOVERY_RESOLVING)
|
|
|
hci_discovery_set_state(hdev,
|
|
|
DISCOVERY_STOPPED);
|
|
|
} else {
|