]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
mmc: sh_mmcif: Fix timeout value for command request
authorTakeshi Kihara <takeshi.kihara.df@renesas.com>
Wed, 29 Apr 2015 17:03:51 +0000 (02:03 +0900)
committerJiri Slaby <jslaby@suse.cz>
Wed, 20 May 2015 09:15:44 +0000 (11:15 +0200)
commitb1c8515067ef5a55542ae0fc114feb087fb0dd09
tree0924bc03ac79648bd219733cc98cec4cda4be041
parente90f66563d7223315a1f54d0a91216d5d6313506
mmc: sh_mmcif: Fix timeout value for command request

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: Jiri Slaby <jslaby@suse.cz>
drivers/mmc/host/sh_mmcif.c