virtio-mem: simplify high-level unplug handling in Sub Block Mode

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

diff --git a/drivers/bluetooth/btmtkuart.c b/drivers/bluetooth/btmtkuart.c
index 6c40bc7..e9d91d7 100644 (file)
--- a/drivers/bluetooth/btmtkuart.c
+++ b/drivers/bluetooth/btmtkuart.c
@@ -581,11 +581,9 @@ static int btmtkuart_open(struct hci_dev *hdev)
 
        /* Enable the power domain and clock the device requires */
        pm_runtime_enable(dev);
-       err = pm_runtime_get_sync(dev);
-       if (err < 0) {
-               pm_runtime_put_noidle(dev);
+       err = pm_runtime_resume_and_get(dev);
+       if (err < 0)
                goto err_disable_rpm;
-       }
 
        err = clk_prepare_enable(bdev->clk);
        if (err < 0)