summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDeepesh Gujarathi <dgujarathi@nvidia.com>2010-02-15 21:03:54 +0530
committerDeepesh Gujarathi <dgujarathi@nvidia.com>2010-02-15 21:03:54 +0530
commitc65c9c103697ba15e9fe8ad7d6544c94c572d16a (patch)
tree5835a3b77d866152742b0dcda996a6dec2871344 /drivers
parent6b8ef3d494af9aaa3377f8675904b721970204f9 (diff)
tegra: remove delayed suspend from sdhci driver
Using delayed suspend prevents the system from going into suspend. The delayed suspend work queue acquires a wakelock and the power manager kicks in before the delayed suspend gets scheduled.
Diffstat (limited to 'drivers')
-rwxr-xr-xdrivers/mmc/host/sdhci.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 38cace1bfd14..4b0ec72eba1a 100755
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -35,8 +35,6 @@
#define SDHCI_USE_LEDS_CLASS
#endif
-#define SDHCI_DISABLE_TIMEOUT 50
-
static unsigned int debug_quirks = 0;
static void sdhci_prepare_data(struct sdhci_host *, struct mmc_data *);
@@ -1752,8 +1750,6 @@ int sdhci_add_host(struct sdhci_host *host)
mmc->caps |= MMC_CAP_8_BIT_DATA;
#ifdef CONFIG_MMC_SDHCI_DYNAMIC_SDMEM_CLOCK
mmc->caps |= MMC_CAP_DISABLE;
- /* Use delayed suspend */
- mmc_set_disable_delay(mmc, msecs_to_jiffies(SDHCI_DISABLE_TIMEOUT));
#endif
mmc->ocr_avail = 0;
if (caps & SDHCI_CAN_VDD_330)