Merge tag 'mmc-v4.5-rc4' of git://git.linaro.org/people/ulf.hansson/mmc

Pull MMC fix from Ulf Hansson:
 "Here's an mmc fix intended for v4.5 rc6.

  MMC host:
   - omap_hsmmc: Fix PM regression for deferred probe"

* tag 'mmc-v4.5-rc4' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: omap_hsmmc: Fix PM regression with deferred probe for pm_runtime_reinit

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index b6639ea0bf18..f6e4d9718035 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2232,6 +2232,7 @@ err_irq:
                 dma_release_channel(host->tx_chan);
         if (host->rx_chan)
                 dma_release_channel(host->rx_chan);
+        pm_runtime_dont_use_autosuspend(host->dev);
         pm_runtime_put_sync(host->dev);
         pm_runtime_disable(host->dev);
         if (host->dbclk)
@@ -2253,6 +2254,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
         dma_release_channel(host->tx_chan);
         dma_release_channel(host->rx_chan);
 
+        pm_runtime_dont_use_autosuspend(host->dev);
         pm_runtime_put_sync(host->dev);
         pm_runtime_disable(host->dev);
         device_init_wakeup(&pdev->dev, false);