Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / mmc / host / sdhci.c

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 836e2ac36a0df682f00550a8c1d445bc8bd4b2e7..16d7f939a747a9e636c159f2c7f81c9491edadaf 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1220,7 +1220,9 @@ clock_set:
                        return;
                }
                timeout--;
                        return;
                }
                timeout--;

-               mdelay(1);
+               spin_unlock_irq(&host->lock);
+               usleep_range(900, 1100);
+               spin_lock_irq(&host->lock);

        }
 
        clk |= SDHCI_CLOCK_CARD_EN;
        }
 
        clk |= SDHCI_CLOCK_CARD_EN;