From 192aa36102c8bfb28c89099df11934408409c329 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Wed, 6 Apr 2011 13:01:59 +0200 Subject: [PATCH] --- yaml --- r: 246931 b: refs/heads/master c: e1ba1f15469903b6f443fbf00f069d169e3fba6d h: refs/heads/master i: 246929: 0c610dc454ee234b1254e86ad856d686f92dbe7e 246927: 583dbe30f8c463c51dc77e017654cd0d698da6aa v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_event.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 107a98d57f5a..8c5586d36a45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f69bda6aa8b365169b4a6fd35432ee40574d661 +refs/heads/master: e1ba1f15469903b6f443fbf00f069d169e3fba6d diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c index 7a3398d9cd65..c7eb073fe633 100644 --- a/trunk/net/bluetooth/hci_event.c +++ b/trunk/net/bluetooth/hci_event.c @@ -2497,6 +2497,9 @@ static inline void hci_remote_oob_data_request_evt(struct hci_dev *hdev, hci_dev_lock(hdev); + if (!test_bit(HCI_MGMT, &hdev->flags)) + goto unlock; + data = hci_find_remote_oob_data(hdev, &ev->bdaddr); if (data) { struct hci_cp_remote_oob_data_reply cp; @@ -2515,6 +2518,7 @@ static inline void hci_remote_oob_data_request_evt(struct hci_dev *hdev, &cp); } +unlock: hci_dev_unlock(hdev); }