Commit 0ecdcd3a authored by Linus Torvalds's avatar Linus Torvalds

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
parents 420eb6d7 814a3c0c
...@@ -2232,6 +2232,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev) ...@@ -2232,6 +2232,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
dma_release_channel(host->tx_chan); dma_release_channel(host->tx_chan);
if (host->rx_chan) if (host->rx_chan)
dma_release_channel(host->rx_chan); dma_release_channel(host->rx_chan);
pm_runtime_dont_use_autosuspend(host->dev);
pm_runtime_put_sync(host->dev); pm_runtime_put_sync(host->dev);
pm_runtime_disable(host->dev); pm_runtime_disable(host->dev);
if (host->dbclk) if (host->dbclk)
...@@ -2253,6 +2254,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev) ...@@ -2253,6 +2254,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
dma_release_channel(host->tx_chan); dma_release_channel(host->tx_chan);
dma_release_channel(host->rx_chan); dma_release_channel(host->rx_chan);
pm_runtime_dont_use_autosuspend(host->dev);
pm_runtime_put_sync(host->dev); pm_runtime_put_sync(host->dev);
pm_runtime_disable(host->dev); pm_runtime_disable(host->dev);
device_init_wakeup(&pdev->dev, false); device_init_wakeup(&pdev->dev, false);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment