1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 7273820275e9..0caa3c8bef46 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1490,6 +1490,8 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
         return status;
 
 disable_pm:
+        pm_runtime_dont_use_autosuspend(&pdev->dev);
+        pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
 free_master:
         spi_master_put(master);
@@ -1501,6 +1503,7 @@ static int omap2_mcspi_remove(struct platform_device *pdev)
         struct spi_master *master = platform_get_drvdata(pdev);
         struct omap2_mcspi *mcspi = spi_master_get_devdata(master);
 
+        pm_runtime_dont_use_autosuspend(mcspi->dev);
         pm_runtime_put_sync(mcspi->dev);
         pm_runtime_disable(&pdev->dev);