Bluetooth: Fix mgmt response when HCI_Write_Scan_Enable fails

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / bluetooth / hci_event.c

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index cf992656593742a43788f47a7742a06ff529055e..176cecae4b42c899b74fc44381a584360bd0d267 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -280,11 +280,14 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb)
        if (!sent)
                return;
 
-       if (status != 0)
-               goto done;
-
        param = *((__u8 *) sent);
 
+       if (status != 0) {
+               mgmt_write_scan_failed(hdev->id, param, status);
+               hdev->discov_timeout = 0;
+               goto done;
+       }
+
        old_pscan = test_and_clear_bit(HCI_PSCAN, &hdev->flags);
        old_iscan = test_and_clear_bit(HCI_ISCAN, &hdev->flags);