1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index b45aaa904107..681b089f669a 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1847,7 +1847,7 @@ static unsigned int mmc_align_erase_size(struct mmc_card *card,
  * @card: card to erase
  * @from: first sector to erase
  * @nr: number of sectors to erase
- * @arg: erase command argument (SD supports only %SD_ERASE_ARG)
+ * @arg: erase command argument
  *
  * Caller must claim host before calling this function.
  */
@@ -1864,14 +1864,14 @@ int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr,
         if (!card->erase_size)
                 return -EOPNOTSUPP;
 
-        if (mmc_card_sd(card) && arg != SD_ERASE_ARG)
+        if (mmc_card_sd(card) && arg != SD_ERASE_ARG && arg != SD_DISCARD_ARG)
                 return -EOPNOTSUPP;
 
-        if ((arg & MMC_SECURE_ARGS) &&
+        if (mmc_card_mmc(card) && (arg & MMC_SECURE_ARGS) &&
             !(card->ext_csd.sec_feature_support & EXT_CSD_SEC_ER_EN))
                 return -EOPNOTSUPP;
 
-        if ((arg & MMC_TRIM_ARGS) &&
+        if (mmc_card_mmc(card) && (arg & MMC_TRIM_ARGS) &&
             !(card->ext_csd.sec_feature_support & EXT_CSD_SEC_GB_CL_EN))
                 return -EOPNOTSUPP;