diff options
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 2c5e15d9f864..e15d0f42569d 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c | |||
@@ -1656,6 +1656,9 @@ static int omap_hsmmc_disabled_to_sleep(struct omap_hsmmc_host *host) | |||
1656 | dev_dbg(mmc_dev(host->mmc), "DISABLED -> %s\n", | 1656 | dev_dbg(mmc_dev(host->mmc), "DISABLED -> %s\n", |
1657 | host->dpm_state == CARDSLEEP ? "CARDSLEEP" : "REGSLEEP"); | 1657 | host->dpm_state == CARDSLEEP ? "CARDSLEEP" : "REGSLEEP"); |
1658 | 1658 | ||
1659 | if (mmc_slot(host).no_off) | ||
1660 | return 0; | ||
1661 | |||
1659 | if ((host->mmc->caps & MMC_CAP_NONREMOVABLE) || | 1662 | if ((host->mmc->caps & MMC_CAP_NONREMOVABLE) || |
1660 | mmc_slot(host).card_detect || | 1663 | mmc_slot(host).card_detect || |
1661 | (mmc_slot(host).get_cover_state && | 1664 | (mmc_slot(host).get_cover_state && |
@@ -1671,6 +1674,9 @@ static int omap_hsmmc_sleep_to_off(struct omap_hsmmc_host *host) | |||
1671 | if (!mmc_try_claim_host(host->mmc)) | 1674 | if (!mmc_try_claim_host(host->mmc)) |
1672 | return 0; | 1675 | return 0; |
1673 | 1676 | ||
1677 | if (mmc_slot(host).no_off) | ||
1678 | return 0; | ||
1679 | |||
1674 | if (!((host->mmc->caps & MMC_CAP_NONREMOVABLE) || | 1680 | if (!((host->mmc->caps & MMC_CAP_NONREMOVABLE) || |
1675 | mmc_slot(host).card_detect || | 1681 | mmc_slot(host).card_detect || |
1676 | (mmc_slot(host).get_cover_state && | 1682 | (mmc_slot(host).get_cover_state && |