| From 2bd73b4100b0bcb46fbddc012bdb33b49c96176d Mon Sep 17 00:00:00 2001 |
| From: Nicolas Boichat <drinkcat@chromium.org> |
| Date: Tue, 21 Jul 2020 10:37:16 +0800 |
| Subject: [PATCH] Bluetooth: hci_serdev: Only unregister device if it was |
| registered |
| |
| commit 202798db9570104728dce8bb57dfeed47ce764bc upstream. |
| |
| We should not call hci_unregister_dev if the device was not |
| successfully registered. |
| |
| Fixes: c34dc3bfa7642fd ("Bluetooth: hci_serdev: Introduce hci_uart_unregister_device()") |
| Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> |
| Signed-off-by: Marcel Holtmann <marcel@holtmann.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c |
| index 4652896d4990..ad2f26cb2622 100644 |
| --- a/drivers/bluetooth/hci_serdev.c |
| +++ b/drivers/bluetooth/hci_serdev.c |
| @@ -357,7 +357,8 @@ void hci_uart_unregister_device(struct hci_uart *hu) |
| struct hci_dev *hdev = hu->hdev; |
| |
| clear_bit(HCI_UART_PROTO_READY, &hu->flags); |
| - hci_unregister_dev(hdev); |
| + if (test_bit(HCI_UART_REGISTERED, &hu->flags)) |
| + hci_unregister_dev(hdev); |
| hci_free_dev(hdev); |
| |
| cancel_work_sync(&hu->write_work); |
| -- |
| 2.27.0 |
| |
