1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 310976307954..de67ae60d1b3 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -206,12 +206,14 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_int_emmc = {
                    MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR,
         .caps2   = MMC_CAP2_HC_ERASE_SZ,
         .flags   = SDHCI_ACPI_RUNTIME_PM,
+        .quirks  = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
         .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN | SDHCI_QUIRK2_STOP_WITH_TC,
         .probe_slot     = sdhci_acpi_emmc_probe_slot,
 };
 
 static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sdio = {
-        .quirks  = SDHCI_QUIRK_BROKEN_CARD_DETECTION,
+        .quirks  = SDHCI_QUIRK_BROKEN_CARD_DETECTION |
+                   SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
         .quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON,
         .caps    = MMC_CAP_NONREMOVABLE | MMC_CAP_POWER_OFF_CARD,
         .flags   = SDHCI_ACPI_RUNTIME_PM,
@@ -222,6 +224,7 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sdio = {
 static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sd = {
         .flags   = SDHCI_ACPI_SD_CD | SDHCI_ACPI_SD_CD_OVERRIDE_LEVEL |
                    SDHCI_ACPI_RUNTIME_PM,
+        .quirks  = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
         .quirks2 = SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON |
                    SDHCI_QUIRK2_STOP_WITH_TC,
         .probe_slot     = sdhci_acpi_sd_probe_slot,