diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-03-15 15:24:44 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-03-15 15:24:44 -0700 |
| commit | a7dee8f45fa2948b74d8e84ba24e435c87fd0acf (patch) | |
| tree | 06ec1c93334f581e341cf74f5639ce645266fc14 /drivers/mmc | |
| parent | 7ee7895c93d1d6cafad2f5d187f0a9369e91eaec (diff) | |
| parent | 5ecee0a3ee8d74b6950cb41e8989b0c2174568d4 (diff) | |
| download | linux-a7dee8f45fa2948b74d8e84ba24e435c87fd0acf.tar.bz2 | |
Merge branch 'fixes' into misc
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 2 |
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); |