From a00b8f503610325e042c6dd9a8ce9e8f2b734744 Mon Sep 17 00:00:00 2001 From: Andre Guedes Date: Thu, 23 Feb 2012 16:50:05 +0200 Subject: [PATCH] --- yaml --- r: 291053 b: refs/heads/master c: 69775ff6d101ccf435bd26ae822c24bbb20e11cf h: refs/heads/master i: 291051: 71f1e55ed6f65b2768bfb340681017642029eb0c v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_event.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 00789677d5ab..01bab99b29a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60fc5fb66efa0bcbe028637206ed59df8cd4ac19 +refs/heads/master: 69775ff6d101ccf435bd26ae822c24bbb20e11cf diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c index 276f3ac06089..3d1eef0df2a3 100644 --- a/trunk/net/bluetooth/hci_event.c +++ b/trunk/net/bluetooth/hci_event.c @@ -194,6 +194,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) /* Reset all non-persistent flags */ hdev->dev_flags &= ~(BIT(HCI_LE_SCAN)); + + hdev->discovery.state = DISCOVERY_STOPPED; } static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)