summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_core.c
diff options
context:
space:
mode:
authorSimon Fels2015-09-02 12:10:12 +0200
committerMarcel Holtmann2015-09-17 13:20:02 +0200
commit6b3cc1db68ac83647d37f7d16f0261621eda24aa (patch)
tree65ecf00f7779f21157abbe0ada09f5b5427e3e35 /net/bluetooth/hci_core.c
parentBluetooth: hci_intel: Show error in case of invalid LPM packet size (diff)
downloadkernel-qcow2-linux-6b3cc1db68ac83647d37f7d16f0261621eda24aa.tar.gz
kernel-qcow2-linux-6b3cc1db68ac83647d37f7d16f0261621eda24aa.tar.xz
kernel-qcow2-linux-6b3cc1db68ac83647d37f7d16f0261621eda24aa.zip
Bluetooth: close HCI device when user channel socket gets closed
With 9380f9eacfbbee701daa416edd6625efcd3e29e1 the order of unsetting the HCI_USER_CHANNEL flag of the HCI device was reverted to ensure the device is first closed before making it available again. Due to hci_dev_close checking for HCI_USER_CHANNEL being set on the device it was never really closed and was kept opened. We're now calling hci_dev_do_close directly to make sure the device is correctly closed and we keep the correct order to unset the flag on our device object. Signed-off-by: Simon Fels <simon.fels@canonical.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r--net/bluetooth/hci_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 5a3602046a8b..a7cdd99ec3f1 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1549,7 +1549,7 @@ static void hci_pend_le_actions_clear(struct hci_dev *hdev)
BT_DBG("All LE pending actions cleared");
}
-static int hci_dev_do_close(struct hci_dev *hdev)
+int hci_dev_do_close(struct hci_dev *hdev)
{
BT_DBG("%s %p", hdev->name, hdev);