From cb14072e0c06768dd69be0d566399d5a96e54236 Mon Sep 17 00:00:00 2001 From: Teppei Kamijou Date: Wed, 12 Dec 2012 15:38:09 +0100 Subject: [PATCH] --- yaml --- r: 358643 b: refs/heads/master c: f9fd54f22e79046208ff1656afff7b5f9b7433cb h: refs/heads/master i: 358641: 498da9b90c0e1b6f95ce9c88436e70671575b9cc 358639: 47bc829f08414606042a85c6b4d65de19c69e86e v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sh_mmcif.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 26ff57246b45..f6913f5eb52f 100644 --- 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 index 6d4328dce320..6d3644430877 100644 --- 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;