--- kernel-2.6.28/drivers/mmc/host/omap_hsmmc.c 2011-04-28 23:06:37.000000000 +0200
+++ kernel-2.6.28.new/drivers/mmc/host/omap_hsmmc.c 2011-05-05 22:18:25.174891197 +0200
-@@ -958,34 +958,9 @@ static void set_data_timeout(struct omap
+@@ -958,36 +958,9 @@ static void set_data_timeout(struct omap
unsigned int timeout_ns,
unsigned int timeout_clks)
{
- unsigned int timeout, cycle_ns;
- uint32_t reg, clkd, dto = 0;
-+ uint32_t reg, dto = 14;
-
- reg = OMAP_HSMMC_READ(host->base, SYSCTL);
+-
+- reg = OMAP_HSMMC_READ(host->base, SYSCTL);
- clkd = (reg & CLKD_MASK) >> CLKD_SHIFT;
- if (clkd == 0)
- clkd = 1;
- dto = 14;
- }
-
++ uint32_t reg = OMAP_HSMMC_READ(host->base, SYSCTL);
reg &= ~DTO_MASK;
- reg |= dto << DTO_SHIFT;
+- reg |= dto << DTO_SHIFT;
++ reg |= DTO << DTO_SHIFT;
OMAP_HSMMC_WRITE(host->base, SYSCTL, reg);
+ }
+