Merge tag 'mm-hotfixes-stable-2022-10-11' of git://git.kernel.org/pub/scm/linux/kerne...

[linux-block.git] / drivers / bluetooth / hci_serdev.c

diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c
index c0e5f42ec6b7df50b5fea4e67deee6e00f39440c..f16fd79bc02b8ab6c8e984faf6bf4c5bdb42bd8f 100644 (file)
--- a/drivers/bluetooth/hci_serdev.c
+++ b/drivers/bluetooth/hci_serdev.c
@@ -310,11 +310,12 @@ int hci_uart_register_device(struct hci_uart *hu,
 
        serdev_device_set_client_ops(hu->serdev, &hci_serdev_client_ops);
 
+       if (percpu_init_rwsem(&hu->proto_lock))
+               return -ENOMEM;
+
        err = serdev_device_open(hu->serdev);
        if (err)
-               return err;
-
-       percpu_init_rwsem(&hu->proto_lock);
+               goto err_rwsem;
 
        err = p->open(hu);
        if (err)
@@ -389,6 +390,8 @@ err_alloc:
        p->close(hu);
 err_open:
        serdev_device_close(hu->serdev);
+err_rwsem:
+       percpu_free_rwsem(&hu->proto_lock);
        return err;
 }
 EXPORT_SYMBOL_GPL(hci_uart_register_device);
@@ -410,5 +413,6 @@ void hci_uart_unregister_device(struct hci_uart *hu)
                clear_bit(HCI_UART_PROTO_READY, &hu->flags);
                serdev_device_close(hu->serdev);
        }
+       percpu_free_rwsem(&hu->proto_lock);
 }
 EXPORT_SYMBOL_GPL(hci_uart_unregister_device);