FROMLIST: mmc: core: Fix access to HS400-ES devices

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / core / mmc.c

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 7a20989adabb5a08c119aee70e32fb277c692615..b394c437a8c80e5a0f5c2a309fe129ed494b57a7 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1661,7 +1661,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                err = mmc_select_hs400(card);
                if (err)
                        goto free_card;
-       } else {
+       } else if (!mmc_card_hs400es(card)) {
                /* Select the desired bus width optionally */
                err = mmc_select_bus_width(card);
                if (err > 0 && mmc_card_hs(card)) {