From: Dmitry Shmidt Date: Fri, 13 Aug 2010 01:17:47 +0000 (-0700) Subject: mmc: sdhci-tegra: Always call sdhci suspend/resume functions X-Git-Tag: firefly_0821_release~9833^2~255 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1e1278227f7b7e4b7185bb4c48dcdfca8a42f6af;p=firefly-linux-kernel-4.4.55.git mmc: sdhci-tegra: Always call sdhci suspend/resume functions Signed-off-by: Dmitry Shmidt --- diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index e6c8f2405c44..1b39a1ce2463 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -179,28 +179,24 @@ static int tegra_sdhci_remove(struct platform_device *pdev) static int tegra_sdhci_suspend(struct platform_device *pdev, pm_message_t state) { struct tegra_sdhci_host *host = platform_get_drvdata(pdev); - struct mmc_host *mmc = host->sdhci->mmc; - int ret = 0; + int ret; + + ret = sdhci_suspend_host(host->sdhci, state); + if (ret) + pr_err("%s: failed, error = %d\n", __func__, ret); - if (mmc->card && (mmc->card->type != MMC_TYPE_SDIO)) { - ret = sdhci_suspend_host(host->sdhci, state); - if (ret) - pr_err("%s: failed, error = %d\n", __func__, ret); - } return ret; } static int tegra_sdhci_resume(struct platform_device *pdev) { struct tegra_sdhci_host *host = platform_get_drvdata(pdev); - struct mmc_host *mmc = host->sdhci->mmc; - int ret = 0; + int ret; + + ret = sdhci_resume_host(host->sdhci); + if (ret) + pr_err("%s: failed, error = %d\n", __func__, ret); - if (mmc->card && (mmc->card->type != MMC_TYPE_SDIO)) { - ret = sdhci_resume_host(host->sdhci); - if (ret) - pr_err("%s: failed, error = %d\n", __func__, ret); - } return ret; } #else