From 03b710e80549adf5a0ef8b5b7d441cb845766ea3 Mon Sep 17 00:00:00 2001
From: Hemant Gupta <hemant.gupta@stericsson.com>
Date: Thu, 5 Apr 2012 10:27:21 +0530
Subject: [PATCH] --- yaml --- r: 306872 b: refs/heads/master c:
 b24c62471c276b7ac6105e832eb6fe3c41a654ef h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_core.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ddda606cdf90..ee754347c4ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ed09148fa61e01cd27c92933ba275ea8078b34d
+refs/heads/master: b24c62471c276b7ac6105e832eb6fe3c41a654ef
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
index cc3d164f56fb..a6108469e9eb 100644
--- a/trunk/net/bluetooth/hci_core.c
+++ b/trunk/net/bluetooth/hci_core.c
@@ -385,7 +385,6 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)
 	case DISCOVERY_STOPPED:
 		if (hdev->discovery.state != DISCOVERY_STARTING)
 			mgmt_discovering(hdev, 0);
-		hdev->discovery.type = 0;
 		break;
 	case DISCOVERY_STARTING:
 		break;