1 files changed, 2 insertions, 2 deletions

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