X-Git-Url: http://vcs.maemo.org/git/?p=kernel-bfs;a=blobdiff_plain;f=kernel-bfs-2.6.28%2Fdebian%2Fpatches%2Fclass10sd_dto14_fix.diff;h=300621b412e8afacec129a451932fa5f2a5fd9ac;hp=45b8f25cc4b372c3876ae809cdf0d86926dfa186;hb=4c706ebf98c75b2a2106ad3a6e1dc8eba98136d4;hpb=6b62552431c7be94512dc8ec2f4d3b77cd4d2938

diff --git a/kernel-bfs-2.6.28/debian/patches/class10sd_dto14_fix.diff b/kernel-bfs-2.6.28/debian/patches/class10sd_dto14_fix.diff
index 45b8f25..300621b 100644
--- a/kernel-bfs-2.6.28/debian/patches/class10sd_dto14_fix.diff
+++ b/kernel-bfs-2.6.28/debian/patches/class10sd_dto14_fix.diff
@@ -1,14 +1,13 @@
 --- 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;
@@ -33,6 +32,10 @@
 -			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);
+ }
+