diff --git a/[refs] b/[refs] index ce3bbe4177c9..ed7f1a024214 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2a0a5829c4069ee4a0f28c7301187ffaba91a46 +refs/heads/master: 30832ab56c80d96cfaf5a786524f0d8c57fadfa1 diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c index 6f1fd02fe01b..e06299734f5d 100644 --- a/trunk/drivers/mmc/host/sdhci.c +++ b/trunk/drivers/mmc/host/sdhci.c @@ -1068,7 +1068,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; host->mmc->actual_clock = 0;