usb: typec: add missing MODULE_DEVICE_TABLE() to stusb160x

[linux-2.6-microblaze.git] / drivers / bluetooth / hci_qca.c

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 20e1ded..244b8fe 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -693,8 +693,6 @@ static int qca_close(struct hci_uart *hu)
        destroy_workqueue(qca->workqueue);
        qca->hu = NULL;
 
-       qca_power_shutdown(hu);
-
        kfree_skb(qca->rx_skb);
 
        hu->priv = NULL;
@@ -2007,8 +2005,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)
                err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto);
                if (err) {
                        BT_ERR("Rome serdev registration failed");
-                       if (qcadev->susclk)
-                               clk_disable_unprepare(qcadev->susclk);
+                       clk_disable_unprepare(qcadev->susclk);
                        return err;
                }
        }
@@ -2032,8 +2029,9 @@ static int qca_serdev_probe(struct serdev_device *serdev)
 static void qca_serdev_remove(struct serdev_device *serdev)
 {
        struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev);
+       struct qca_power *power = qcadev->bt_power;
 
-       if (qca_is_wcn399x(qcadev->btsoc_type))
+       if (qca_is_wcn399x(qcadev->btsoc_type) && power->vregs_on)
                qca_power_shutdown(&qcadev->serdev_hu);
        else if (qcadev->susclk)
                clk_disable_unprepare(qcadev->susclk);