1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 64b05c6270f2..9c50e6f1c236 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -248,8 +248,12 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
 
         sg_init_one(&sg, data_buf, len);
 
-        if (card)
-                mmc_set_data_timeout(&data, card);
+        /*
+         * The spec states that CSR and CID accesses have a timeout
+         * of 64 clock cycles.
+         */
+        data.timeout_ns = 0;
+        data.timeout_clks = 64;
 
         mmc_wait_for_req(host, &mrq);