diff options
| author | Colin Cross <ccross@android.com> | 2010-10-28 17:53:24 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-28 17:53:24 -0700 |
| commit | 4dfda9f3b7a3986ab452b3e214a13805ed1acdd4 (patch) | |
| tree | 902548c211059a9ecc196b9e00418e71c8348cf9 /drivers/mmc | |
| parent | cad4b96fa6dc283698b5a9c2aaf8ccdf7d43861a (diff) | |
| parent | 762476fa24df17914e1a8fab42e12d59da87539a (diff) | |
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 61670e1534b0..7577da76fbb2 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -988,7 +988,7 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) u16 clk; unsigned long timeout; - if (clock == host->clock) + if (clock && clock == host->clock) return; if (host->ops->set_clock) { |