diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 07c03cb677b6dcf06f148d03b2b4454b9cad0816..9d29bed820a1eef5da7b2238cc9a3701ac6da18a 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -231,6 +231,15 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card)
 {
 	unsigned int mult;
 
+	/*
+	 * SDIO cards only define an upper 1 s limit on access.
+	 */
+	if (mmc_card_sdio(card)) {
+		data->timeout_ns = 1000000000;
+		data->timeout_clks = 0;
+		return;
+	}
+
 	/*
 	 * SD cards use a 100 multiplier rather than 10
 	 */