summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 fbf3ed14460e..61a06faa06c4 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 cf57bccf9be3..91105939f3c9 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 *