From a1a7244c7deeb80a029983b66d6cd42511081a77 Mon Sep 17 00:00:00 2001 From: Teppei Kamijou Date: Wed, 12 Dec 2012 15:38:09 +0100 Subject: [PATCH] --- yaml --- r: 359877 b: refs/heads/master c: 93c3a791e7ce306f33b8e39d96ae9527c23e925a h: refs/heads/master i: 359875: c5192446898a89ff7751f26438788ab9fe9a5c7b 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 aa36edc264d9..2b6385fae381 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 613c25e7b5d4129d64327f83c00ad1463b606b01 +refs/heads/master: 93c3a791e7ce306f33b8e39d96ae9527c23e925a 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;