---

yaml --- r: 358643 b: refs/heads/master c: f9fd54f h: refs/heads/master i: 358641: 498da9b 358639: 47bc829 v: v3
git-mirror · Feb 11, 2013 · cb14072 · cb14072
1 parent bec6bbc
commit cb14072
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 555061f987787a966b01e62517b9befbd35e2f89
+refs/heads/master: f9fd54f22e79046208ff1656afff7b5f9b7433cb
diff --git a/trunk/drivers/mmc/host/sh_mmcif.c b/trunk/drivers/mmc/host/sh_mmcif.c
@@ -1348,7 +1348,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
 	host		= mmc_priv(mmc);
 	host->mmc	= mmc;
 	host->addr	= reg;
-	host->timeout	= 1000;
+	host->timeout	= msecs_to_jiffies(1000);
 
 	host->pd = pdev;