From 393009b21959ba86c074ccd39bcf37426fefa265 Mon Sep 17 00:00:00 2001
From: Todd Poynor <toddpoynor@google.com>
Date: Tue, 27 Dec 2011 15:48:46 +0200
Subject: [PATCH] --- yaml --- r: 284520 b: refs/heads/master c:
 30832ab56c80d96cfaf5a786524f0d8c57fadfa1 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mmc/host/sdhci.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;