Merge tag 'pci-v5.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-microblaze.git] / drivers / hsi / controllers / omap_ssi_core.c

diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c
index 7596dc1..44a3f56 100644 (file)
--- a/drivers/hsi/controllers/omap_ssi_core.c
+++ b/drivers/hsi/controllers/omap_ssi_core.c
@@ -424,7 +424,7 @@ static int ssi_hw_init(struct hsi_controller *ssi)
        struct omap_ssi_controller *omap_ssi = hsi_controller_drvdata(ssi);
        int err;
 
-       err = pm_runtime_get_sync(ssi->device.parent);
+       err = pm_runtime_resume_and_get(ssi->device.parent);
        if (err < 0) {
                dev_err(&ssi->device, "runtime PM failed %d\n", err);
                return err;