2 files changed, 10 insertions, 2 deletions

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index ecf885b79af1..0a936291f0e7 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1094,8 +1094,12 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
                 break;
 
         case LE_SCANNING_DISABLED:
-                if (status)
+                if (status) {
+                        hci_dev_lock(hdev);
+                        mgmt_stop_discovery_failed(hdev, status);
+                        hci_dev_unlock(hdev);
                         return;
+                }
 
                 clear_bit(HCI_LE_SCAN, &hdev->dev_flags);
 
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 0ef4b6ca6e44..5fc741bab2bf 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2404,7 +2404,11 @@ static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data,
         }
 
         if (hdev->discovery.state == DISCOVERY_FINDING) {
-                err = hci_cancel_inquiry(hdev);
+                if (test_bit(HCI_INQUIRY, &hdev->flags))
+                        err = hci_cancel_inquiry(hdev);
+                else
+                        err = hci_cancel_le_scan(hdev);
+
                 if (err < 0)
                         mgmt_pending_remove(cmd);
                 else