| From bad4371d87d1d1ed1aecd9c9cc21c41ac3f289c8 Mon Sep 17 00:00:00 2001 |
| From: Takeshi Kihara <takeshi.kihara.df@renesas.com> |
| Date: Thu, 30 Apr 2015 02:03:51 +0900 |
| Subject: mmc: sh_mmcif: Fix timeout value for command request |
| |
| From: Takeshi Kihara <takeshi.kihara.df@renesas.com> |
| |
| commit bad4371d87d1d1ed1aecd9c9cc21c41ac3f289c8 upstream. |
| |
| f9fd54f22e ("mmc: sh_mmcif: Use msecs_to_jiffies() for host->timeout") |
| changed the timeout value from 1000 jiffies to 1s. In the case where |
| HZ is 1000 the values are the same. However, for smaller HZ values the |
| timeout is now smaller, 1s instead of 10s in the case of HZ=100. |
| |
| Since the timeout occurs in spite of a normal data transfer a timeout of |
| 10s seems more appropriate. This restores the previous timeout in the |
| case where HZ=100 and results in an increase over the previous timeout |
| for larger values of HZ. |
| |
| Fixes: f9fd54f22e ("mmc: sh_mmcif: Use msecs_to_jiffies() for host->timeout") |
| Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> |
| [horms: rewrote changelog to refer to HZ] |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/mmc/host/sh_mmcif.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/mmc/host/sh_mmcif.c |
| +++ b/drivers/mmc/host/sh_mmcif.c |
| @@ -1402,7 +1402,7 @@ static int sh_mmcif_probe(struct platfor |
| host = mmc_priv(mmc); |
| host->mmc = mmc; |
| host->addr = reg; |
| - host->timeout = msecs_to_jiffies(1000); |
| + host->timeout = msecs_to_jiffies(10000); |
| host->ccs_enable = !pd || !pd->ccs_unsupported; |
| host->clk_ctrl2_enable = pd && pd->clk_ctrl2_present; |
| |
