From ee776e8e9aaa7ea4fae8b80a22c497e7f270c55a Mon Sep 17 00:00:00 2001
From: Andre Guedes <andre.guedes@openbossa.org>
Date: Fri, 3 Feb 2012 17:47:58 -0300
Subject: [PATCH] --- yaml --- r: 290928 b: refs/heads/master c:
 6fbe195dc41c4fae1fa7aca1a38c888de1d24e2d h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/net/bluetooth/hci_core.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5142d6f626fb..765fad348c2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c599008f8f999dab8cb4a6404be99bdc4716ba15
+refs/heads/master: 6fbe195dc41c4fae1fa7aca1a38c888de1d24e2d
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
index 1705d9372725..1175f27bd445 100644
--- a/trunk/net/bluetooth/hci_core.c
+++ b/trunk/net/bluetooth/hci_core.c
@@ -360,12 +360,15 @@ bool hci_discovery_active(struct hci_dev *hdev)
 {
 	struct discovery_state *discov = &hdev->discovery;
 
-	if (discov->state == DISCOVERY_INQUIRY ||
-					discov->state == DISCOVERY_LE_SCAN ||
-					discov->state == DISCOVERY_RESOLVING)
+	switch (discov->state) {
+	case DISCOVERY_INQUIRY:
+	case DISCOVERY_LE_SCAN:
+	case DISCOVERY_RESOLVING:
 		return true;
 
-	return false;
+	default:
+		return false;
+	}
 }
 
 void hci_discovery_set_state(struct hci_dev *hdev, int state)