3 files changed, 6 insertions, 1 deletions

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index be8da5d54abb..d7c79b5335c2 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -57,6 +57,7 @@ struct inquiry_entry {
 };
 
 struct discovery_state {
+        int type;
         enum {
                 DISCOVERY_STOPPED,
                 DISCOVERY_STARTING,
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index dc31e7d6028e..29a9b01c3b9b 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -380,6 +380,8 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)
 
         switch (state) {
         case DISCOVERY_STOPPED:
+                hdev->discovery.type = 0;
+
                 if (hdev->discovery.state != DISCOVERY_STARTING)
                         mgmt_discovering(hdev, 0);
                 break;
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 196215c9d424..9d98382e48c7 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2192,7 +2192,9 @@ static int start_discovery(struct sock *sk, u16 index,
                 goto failed;
         }
 
-        switch (cp->type) {
+        hdev->discovery.type = cp->type;
+
+        switch (hdev->discovery.type) {
         case DISCOV_TYPE_BREDR:
         case DISCOV_TYPE_INTERLEAVED:
                 err = hci_do_inquiry(hdev, INQUIRY_LEN_BREDR);