Merge remote-tracking branch 'char-misc/char-misc-next'

[karo-tx-linux.git] / drivers / misc / mei / pci-me.c

diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index af44ee26075d8b520401a2cc52150b74d45157f0..23f71f5ce4fb07be4bb9c32021bf3babef6b938d 100644 (file)
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -388,7 +388,7 @@ static int mei_me_pm_runtime_suspend(struct device *device)
        mutex_lock(&dev->device_lock);
 
        if (mei_write_is_idle(dev))
-               ret = mei_me_pg_set_sync(dev);
+               ret = mei_me_pg_enter_sync(dev);
        else
                ret = -EAGAIN;
 
@@ -413,7 +413,7 @@ static int mei_me_pm_runtime_resume(struct device *device)
 
        mutex_lock(&dev->device_lock);
 
-       ret = mei_me_pg_unset_sync(dev);
+       ret = mei_me_pg_exit_sync(dev);
 
        mutex_unlock(&dev->device_lock);