diff options
| author | Hemant Gupta <hemant.gupta@stericsson.com> | 2012-04-05 10:27:21 +0530 |
|---|---|---|
| committer | Gustavo Padovan <gustavo@padovan.org> | 2012-05-09 00:41:37 -0300 |
| commit | b24c62471c276b7ac6105e832eb6fe3c41a654ef (patch) | |
| tree | d4d53c91cb8cb5e47155f4bfe94ca34274eb6dee | |
| parent | 0ed09148fa61e01cd27c92933ba275ea8078b34d (diff) | |
| download | linux-stable-b24c62471c276b7ac6105e832eb6fe3c41a654ef.tar.gz linux-stable-b24c62471c276b7ac6105e832eb6fe3c41a654ef.tar.bz2 linux-stable-b24c62471c276b7ac6105e832eb6fe3c41a654ef.zip | |
Bluetooth: Fix clearing discovery type when stopping discovery
This patch prevents resetting of discovery type while stopping
discovery, since otherwise the wrong type might be send in case of
discovery failure. It also doesn't matter that we are "lazy" with
updating the type since it is anyway reset when starting discovery again
and it's not needed to know the current discovery state.
Signed-off-by: Hemant Gupta <hemant.gupta@stericsson.com>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
| -rw-r--r-- | net/bluetooth/hci_core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index cc3d164f56fb..a6108469e9eb 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -385,7 +385,6 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state) case DISCOVERY_STOPPED: if (hdev->discovery.state != DISCOVERY_STARTING) mgmt_discovering(hdev, 0); - hdev->discovery.type = 0; break; case DISCOVERY_STARTING: break; |