diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 54088768776cfcbc929506a723331a5efd92cddc..7939015192086953211019839787d4180ef963f0 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -663,7 +663,7 @@ static int mmc_select_powerclass(struct mmc_card *card,
 		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
 				 EXT_CSD_POWER_CLASS,
 				 pwrclass_val,
-				 0);
+				 card->ext_csd.generic_cmd6_time);
 	}
 
 	return err;