--- linux-2.6.38/drivers/mmc/host/sdhci.c	2011-03-14 21:20:32.000000000 -0400
+++ linux-2.6.38/drivers/mmc/host/sdhci.c	2011-05-28 18:49:45.538077065 -0400
@@ -607,7 +607,7 @@
 
 	/* timeout in us */
 	target_timeout = data->timeout_ns / 1000 +
-		data->timeout_clks / host->clock;
+		(data->timeout_clks * 1000) / (host->clock / 1000);
 
 	if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
 		host->timeout_clk = host->clock / 1000;