diff options
| author | Gabriele Mazzotta <gabriele.mzt@gmail.com> | 2015-04-26 20:51:50 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2015-04-30 18:45:27 +0200 |
| commit | d24d81444f8caf1895256ef2d2e89ae8202a17e4 (patch) | |
| tree | 04220c0d5248da784125aa4ee7ee550f6354c366 /net | |
| parent | 7f0b8a56c978b0a3315ac84c6cbb065413afb8e9 (diff) | |
| download | linux-d24d81444f8caf1895256ef2d2e89ae8202a17e4.tar.gz linux-d24d81444f8caf1895256ef2d2e89ae8202a17e4.tar.bz2 linux-d24d81444f8caf1895256ef2d2e89ae8202a17e4.zip | |
Bluetooth: Skip the shutdown routine if the interface is not up
Most likely, the shutdown routine requires the interface to be up.
This is the case for BTUSB_INTEL: the routine tries to send a command
to the interface, but since this one is down, it fails and exits once
HCI_INIT_TIMEOUT has expired.
Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org # 4.0.x
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 476709bd068a..4663c3dad3f5 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1557,7 +1557,8 @@ 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)) { + if (!hci_dev_test_flag(hdev, HCI_UNREGISTER) && + test_bit(HCI_UP, &hdev->flags)) { /* Execute vendor specific shutdown routine */ if (hdev->shutdown) hdev->shutdown(hdev); |