OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e5719b6
)
Bluetooth: Don't call shutdown when leaving user channel
author
Loic Poulain
<loic.poulain@intel.com>
Tue, 9 Jun 2015 09:46:30 +0000
(11:46 +0200)
committer
Marcel Holtmann
<marcel@holtmann.org>
Tue, 9 Jun 2015 09:47:25 +0000
(11:47 +0200)
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>
net/bluetooth/hci_core.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/hci_core.c
b/net/bluetooth/hci_core.c
index
f6c9909
..
573711c
100644
(file)
--- 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)