1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 14c58caac990..a4dd43f117f0 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -997,7 +997,8 @@ static int omap_hsmmc_start_dma_transfer(struct omap_hsmmc_host *host,
 }
 
 static void set_data_timeout(struct omap_hsmmc_host *host,
-                             struct mmc_request *req)
+                             unsigned int timeout_ns,
+                             unsigned int timeout_clks)
 {
         unsigned int timeout, cycle_ns;
         uint32_t reg, clkd, dto = 0;
@@ -1008,8 +1009,8 @@ static void set_data_timeout(struct omap_hsmmc_host *host,
                 clkd = 1;
 
         cycle_ns = 1000000000 / (clk_get_rate(host->fclk) / clkd);
-        timeout = req->data->timeout_ns / cycle_ns;
-        timeout += req->data->timeout_clks;
+        timeout = timeout_ns / cycle_ns;
+        timeout += timeout_clks;
         if (timeout) {
                 while ((timeout & 0x80000000) == 0) {
                         dto += 1;
@@ -1043,12 +1044,18 @@ omap_hsmmc_prepare_data(struct omap_hsmmc_host *host, struct mmc_request *req)
 
         if (req->data == NULL) {
                 OMAP_HSMMC_WRITE(host->base, BLK, 0);
+                /*
+                 * Set an arbitrary 100ms data timeout for commands with
+                 * busy signal.
+                 */
+                if (req->cmd->flags & MMC_RSP_BUSY)
+                        set_data_timeout(host, 100000000U, 0);
                 return 0;
         }
 
         OMAP_HSMMC_WRITE(host->base, BLK, (req->data->blksz)
                                         | (req->data->blocks << 16));
-        set_data_timeout(host, req);
+        set_data_timeout(host, req->data->timeout_ns, req->data->timeout_clks);
 
         if (host->use_dma) {
                 ret = omap_hsmmc_start_dma_transfer(host, req);