From 629dbddb361b5f29599553a9cb3c849af50acb2c Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Wed, 22 Feb 2012 18:11:53 +0200
Subject: [PATCH] --- yaml --- r: 291031 b: refs/heads/master c:
 e59fda8dc14c173b74b5e9d5c8d72849d2ff6b5f h: refs/heads/master i:   291029:
 734e4ca582ce7a064eab52722ed4717c1c7340f5   291027:
 41717380d80e0873d3333eca43b041f3b4091628   291023:
 85177c966ed3b296d5eafb9c922eae03c58a6108 v: v3

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

diff --git a/[refs] b/[refs]
index 9d8b08ca0cc6..277fb3fbc8fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06199cf86a84206cfdc96b8dc02d5c27efa8c60f
+refs/heads/master: e59fda8dc14c173b74b5e9d5c8d72849d2ff6b5f
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
index e1dadeea4c2f..2d75ffb42f7d 100644
--- a/trunk/net/bluetooth/hci_core.c
+++ b/trunk/net/bluetooth/hci_core.c
@@ -794,6 +794,8 @@ static int hci_dev_do_close(struct hci_dev *hdev)
 	/* Clear flags */
 	hdev->flags = 0;
 
+	memset(hdev->eir, 0, sizeof(hdev->eir));
+
 	hci_req_unlock(hdev);
 
 	hci_dev_put(hdev);