---

yaml --- r: 262975 b: refs/heads/master c: 78a2ca2 h: refs/heads/master i: 262973: 6a8f17e 262971: 5c6b1c1 262967: 656a150 262959: 86bd746 262943: 0f5cb86 262911: 174b992 v: v3
git-mirror · Aug 13, 2011 · 8bb24b5 · 8bb24b5
1 parent 88bc21e
commit 8bb24b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83cbcd93a1be803ccda53e7acbdc9a937c8f6375
+refs/heads/master: 78a2ca2727a9b992901c715bc881b6ddb4ec6a4e
diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c
@@ -628,9 +628,11 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd)
 	/* timeout in us */
 	if (!data)
 		target_timeout = cmd->cmd_timeout_ms * 1000;
-	else
-		target_timeout = data->timeout_ns / 1000 +
-			data->timeout_clks / host->clock;
+	else {
+		target_timeout = data->timeout_ns / 1000;
+		if (host->clock)
+			target_timeout += data->timeout_clks / host->clock;
+	}
 
 	/*
 	 * Figure out needed cycles.