summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2018-05-02 13:55:17 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2018-05-08 09:43:26 +0200
commitec30f11e821f2dcf707d0c66e01e87fbe8b91a66 (patch)
treee3add626e56637ca7f54687b524a0cab1e946adc /drivers/mmc/host
parent4b7d45451dff133b6453cb9571ea5349be1ce14f (diff)
downloadlinux-stable-ec30f11e821f2dcf707d0c66e01e87fbe8b91a66.tar.gz
linux-stable-ec30f11e821f2dcf707d0c66e01e87fbe8b91a66.tar.bz2
linux-stable-ec30f11e821f2dcf707d0c66e01e87fbe8b91a66.zip
mmc: rtsx_usb: Use the provided busy timeout from the mmc core
Instead of using a fixed 3s timeout for commands with R1B responses, convert to use the per request calculated busy timeout from the mmc core. This is needed to cope with requests that requires longer timeout, for example erase/discard commands. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Tested-by: MichaƂ Pecio <michal.pecio@gmail.com>
Diffstat (limited to 'drivers/mmc/host')
-rw-r--r--drivers/mmc/host/rtsx_usb_sdmmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c
index f9faa98c5465..560614c5934e 100644
--- a/drivers/mmc/host/rtsx_usb_sdmmc.c
+++ b/drivers/mmc/host/rtsx_usb_sdmmc.c
@@ -342,7 +342,7 @@ static void sd_send_cmd_get_rsp(struct rtsx_usb_sdmmc *host,
}
if (rsp_type == SD_RSP_TYPE_R1b)
- timeout = 3000;
+ timeout = cmd->busy_timeout ? cmd->busy_timeout : 3000;
if (cmd->opcode == SD_SWITCH_VOLTAGE) {
err = rtsx_usb_write_register(ucr, SD_BUS_STAT,