summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDavid Schalig <dschalig@nvidia.com>2011-06-02 22:17:14 +0900
committerRohan Somvanshi <rsomvanshi@nvidia.com>2011-06-14 05:16:20 -0700
commit68a04888baab4043d83fc4fd2d9cf95eda444d80 (patch)
tree70742a2e9b8a33e288be149b5930e95eb560f432 /arch
parentf5eae65898778526e7b7cdb63a575c0dd513ccf4 (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 Change-Id: I516272a5a0af44ba27122cc0c6476512cf5b617d Reviewed-on: http://git-master/r/36254 Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tegra_android_defconfig2
-rw-r--r--arch/arm/configs/tegra_defconfig2
-rw-r--r--arch/arm/configs/tegra_secure_os_defconfig2
-rw-r--r--arch/arm/configs/tegra_whistler_android_defconfig2
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 e47f49e42bc4..1545a4232b47 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_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_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 22d19fa09af4..b563099c7035 100644
--- a/arch/arm/configs/tegra_whistler_android_defconfig
+++ b/arch/arm/configs/tegra_whistler_android_defconfig
@@ -287,7 +287,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