diff options
| author | David Schalig <dschalig@nvidia.com> | 2011-06-02 22:17:14 +0900 |
|---|---|---|
| committer | Yuhao Ding <yding@nvidia.com> | 2011-06-16 18:32:34 -0700 |
| commit | 191aa3eb0f06f082e10d055080e91a9a25b9492e (patch) | |
| tree | e245bca6d2dbc802460b72ae74f056652b640665 | |
| parent | e69f9291f85c4eeaa02091111a8fc8835efe333e (diff) | |
mmc: tegra: disable broken deferred resume
MMC_BLOCK_DEFERRED_RESUME causes race conditions in the SD/MMC driver,
i.e. mmc_sd_detect() will be called from different threads causing
inconsistent state. Disabling feature for Tegra.
Bug 833034
http://git-master/r/#change,36254
(cherry picked from commit a8b6bb5de9b9645ecdabc3e954f04898e45e9038)
Change-Id: Ie28fa42e28ab98d8bffef7e48591cbec98af5fe2
Reviewed-on: http://git-master/r/36430
Reviewed-by: Yuhao Ding <yding@nvidia.com>
Tested-by: Yuhao Ding <yding@nvidia.com>
| -rw-r--r-- | arch/arm/configs/tegra_android_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_secure_os_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_whistler_android_defconfig | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig index 7a50ee0b46e8..172f2378312e 100644 --- a/arch/arm/configs/tegra_android_defconfig +++ b/arch/arm/configs/tegra_android_defconfig @@ -300,7 +300,7 @@ CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y CONFIG_MMC_PARANOID_SD_INIT=y # CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_BLOCK_DEFERRED_RESUME=y +# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_TEGRA=y CONFIG_SWITCH=y diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 3ba6a4548c62..ac6dd0358d11 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -302,7 +302,7 @@ CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y CONFIG_MMC_PARANOID_SD_INIT=y # CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_BLOCK_DEFERRED_RESUME=y +# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_TEGRA=y CONFIG_SWITCH=y diff --git a/arch/arm/configs/tegra_secure_os_defconfig b/arch/arm/configs/tegra_secure_os_defconfig index 4c3b59e80fa9..41ef9bbdde36 100644 --- a/arch/arm/configs/tegra_secure_os_defconfig +++ b/arch/arm/configs/tegra_secure_os_defconfig @@ -301,7 +301,7 @@ CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y CONFIG_MMC_PARANOID_SD_INIT=y # CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_BLOCK_DEFERRED_RESUME=y +# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_TEGRA=y CONFIG_SWITCH=y diff --git a/arch/arm/configs/tegra_whistler_android_defconfig b/arch/arm/configs/tegra_whistler_android_defconfig index a60ebf614f94..b9f257550417 100644 --- a/arch/arm/configs/tegra_whistler_android_defconfig +++ b/arch/arm/configs/tegra_whistler_android_defconfig @@ -288,7 +288,7 @@ CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y CONFIG_MMC_PARANOID_SD_INIT=y # CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_BLOCK_DEFERRED_RESUME=y +# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_TEGRA=y CONFIG_SWITCH=y |