summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarry Hong <hhong@nvidia.com>2014-10-20 19:44:09 -0700
committerHarry Hong <hhong@nvidia.com>2014-10-21 18:09:58 -0700
commit32cff5afbb263eb624a50d4e58a2a7f718e2aeff (patch)
tree89343324aa7f0d17d11f9f724b7b3817d36fd534
parent40503be4e2656ba2ffc1f4e087087694328fe254 (diff)
Revert "mmc: core: disable sanitize operation."daily-2014.11.13.0_rel-tegranote-r8-partner
This reverts commit 625cef6510b7c65fd043738fce577e017b415c0d. Bug 1567183 Change-Id: I02f2b3cd20cc492737641632d9dace2a9702d2c8 Signed-off-by: Harry Hong <hhong@nvidia.com> Reviewed-on: http://git-master/r/559682
-rw-r--r--drivers/mmc/core/Kconfig6
-rw-r--r--drivers/mmc/core/mmc.c6
2 files changed, 1 insertions, 11 deletions
diff --git a/drivers/mmc/core/Kconfig b/drivers/mmc/core/Kconfig
index fbf3ed1..61a06fa 100644
--- a/drivers/mmc/core/Kconfig
+++ b/drivers/mmc/core/Kconfig
@@ -54,9 +54,3 @@ config MMC_FREQ_SCALING
device frequency dynamically. Enable this config only if
there is a custom implementation to determine the frequency
using the device stats.
-
-config SEC_SANITIZE_IGNORE
- bool "Disable Sanitize"
- default N
- help
- If you say Y here, Disable Sanitize.
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index cf57bcc..9110593 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -459,11 +459,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
if (card->ext_csd.rev == 6) {
card->ext_csd.sec_feature_support =
ext_csd[EXT_CSD_SEC_FEATURE_SUPPORT] &
-#if defined(CONFIG_SEC_SANITIZE_IGNORE)
- ~(EXT_CSD_SEC_ER_EN | EXT_CSD_SEC_SANITIZE);
-#else
- ~(EXT_CSD_SEC_ER_EN);
-#endif
+ ~EXT_CSD_SEC_ER_EN;
}
card->ext_csd.trim_timeout = 300 *