[PATCH 5.8 307/464] Bluetooth: hci_serdev: Only unregister device if it was registered

[Greg Kroah-Hartman]

From: Nicolas Boichat <drink...@chromium.org>

[ Upstream commit 202798db9570104728dce8bb57dfeed47ce764bc ]

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 <drink...@chromium.org>
Signed-off-by: Marcel Holtmann <mar...@holtmann.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/bluetooth/hci_serdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c
index 599855e4c57c1..7b233312e723f 100644
--- a/drivers/bluetooth/hci_serdev.c
+++ b/drivers/bluetooth/hci_serdev.c
@@ -355,7 +355,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.25.1