Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / sdhci.c

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 8bcd5e98d994ee1c8997ac7c8a1ca5beb70cee1c..6103edad46f00f2f2828e10e85e80876cead505e 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1044,7 +1044,7 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
        u16 clk = 0;
        unsigned long timeout;
 
-       if (clock == host->clock)
+       if (clock && clock == host->clock)
                return;
 
        if (host->ops->set_clock) {