diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-18 16:15:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-18 16:15:31 -0400 |
| commit | 456cdf53efb428ce29630485b8c56e8877af36d6 (patch) | |
| tree | 8525a42706ce54d146e6e65a2660f0c165725d71 /net | |
| parent | 21858cd02dabcf290564cbf4769b101eba54d7bb (diff) | |
| parent | 177d0506a911eb60b38b172215df5325ed94fa64 (diff) | |
| download | linux-456cdf53efb428ce29630485b8c56e8877af36d6.tar.gz linux-456cdf53efb428ce29630485b8c56e8877af36d6.tar.bz2 linux-456cdf53efb428ce29630485b8c56e8877af36d6.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
pull request: bluetooth 2015-05-17
A couple more Bluetooth updates for 4.1:
- New USB IDs for ath3k & btusb
- Fix for remote name resolving during device discovery
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 4663c3dad3f5..c4802f3bd4c5 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -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 { |