Bluetooth: Fix mgmt response when HCI_Write_Scan_Enable fails

A proper mgmt_command_status should be returned to user-space if either
discoverable or connectable enabling fails.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

1 files changed, 6 insertions, 3 deletions

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index cf9926565937..176cecae4b42 100644
--- 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);