---

yaml --- r: 291007 b: refs/heads/master c: df2c6c5 h: refs/heads/master i: 291005: 493c4cb 291003: d45275f 290999: 0816a98 290991: 51bfb23 290975: a79dd99 290943: 5ad1f2a v: v3
git-mirror · Feb 21, 2012 · b070bd7 · b070bd7
1 parent 3a1fe4f
commit b070bd7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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);