diff options
author | Loic Poulain <loic.poulain@intel.com> | 2015-06-09 11:46:30 +0200 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2015-06-09 11:47:25 +0200 |
commit | 867146a0d242bb9aecc267aa33e0804501550368 (patch) | |
tree | 09f33bce916867734b9e9577cfdaf047293861f9 /net/bluetooth | |
parent | ieee802154/mrf24j40: make sure we do not override return values (diff) | |
download | linux-867146a0d242bb9aecc267aa33e0804501550368.tar.xz linux-867146a0d242bb9aecc267aa33e0804501550368.zip |
Bluetooth: Don't call shutdown when leaving user channel
Don't interfere with the user channel exclusive access.
Signed-off-by: Loic Poulain <loic.poulain@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/hci_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index f6c99098959f..573711c2d09e 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1553,6 +1553,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) BT_DBG("%s %p", hdev->name, hdev); if (!hci_dev_test_flag(hdev, HCI_UNREGISTER) && + !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) && test_bit(HCI_UP, &hdev->flags)) { /* Execute vendor specific shutdown routine */ if (hdev->shutdown) |