From b070bd77b985dabb701fd28e19750cb5d196ed93 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Tue, 21 Feb 2012 19:15:49 +0200
Subject: [PATCH] --- yaml --- r: 291007 b: refs/heads/master c:
 df2c6c5ed5c0bc13b78e855d3e5d9aa3472567ba h: refs/heads/master i:   291005:
 493c4cb584a099589767d0865a72f877518eedb4   291003:
 d45275f3a8eb3e6bd2bb6c351468b02116b51100   290999:
 0816a9846e2d9a0d7a9dde61e19fcae4cac7f0d0   290991:
 51bfb23084f96ba93bf9b957497bbb74627c5f59   290975:
 a79dd990cb851ac52d69f1fa10e964f1748ba0a1   290943:
 5ad1f2a53fafbb64cb37b0f7e75663d3aa8a61f4 v: v3

---
 [refs]                     | 2 +-
 trunk/net/bluetooth/mgmt.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 957b33f35bc0..6d266c557eaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e5282bbfde9ca6157dba913d90cbab859a837e2
+refs/heads/master: df2c6c5ed5c0bc13b78e855d3e5d9aa3472567ba
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 6311be775ff2..eec70a4ba36c 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -935,9 +935,14 @@ static int set_connectable(struct sock *sk, u16 index, void *data, u16 len)
 
 	if (cp->val)
 		scan = SCAN_PAGE;
-	else
+	else {
 		scan = 0;
 
+		if (test_bit(HCI_ISCAN, &hdev->flags) &&
+						hdev->discov_timeout > 0)
+			cancel_delayed_work(&hdev->discov_off);
+	}
+
 	err = hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
 	if (err < 0)
 		mgmt_pending_remove(cmd);