diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-02-28 22:26:12 +0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-02-28 22:28:16 +0400 |
commit | 317ac8cb3f9fb58b9ec5764b766a449004ab2a62 (patch) | |
tree | f94c7db069a87514a4b5e16cff1dafbbd5981dd7 /drivers/bluetooth/hci_h5.c | |
parent | e3098be40bbde0fdd5fcfa6bf28491db421d333a (diff) | |
download | linux-317ac8cb3f9fb58b9ec5764b766a449004ab2a62.tar.xz |
Bluetooth: Fix trying to disable scanning twice
The discovery process has a timer for disabling scanning, however
scanning might be disabled through other means too like the auto-connect
process. We should therefore ensure that the timer is never active
after sending a HCI command to disable scanning.
There was some existing code in stop_scan_complete trying to avoid the
timer when a connect request interrupts a discovery procedure, but the
other way around was not covered. This patch covers both scenarios by
canceling the timer as soon as we get a successful command complete for
the disabling HCI command.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/hci_h5.c')
0 files changed, 0 insertions, 0 deletions