aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2016-07-26 01:16:59 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2016-07-29 11:29:04 +0200
commit27f4bf7d74547ab15474c773f7231dff44ccb2a5 (patch)
treeccd767dd0628bc326da00fb2048328a70d7cdf93 /drivers
parentmmc: sdhci-pltfm: Drop define for SDHCI_PLTFM_PMOPS (diff)
downloadlinux-dev-27f4bf7d74547ab15474c773f7231dff44ccb2a5.tar.xz
linux-dev-27f4bf7d74547ab15474c773f7231dff44ccb2a5.zip
mmc: rtsx_pci: Use the provided busy timeout from the mmc core
The rtsx_pci driver is using a fixed 3s timeout for R1B responses, which in some cases isn't suffient. For example, erase/discard requests may require longer timeouts. Instead of always using a fixed timeout, let's use the per request calculated busy timeout from the mmc core. Cc: Micky Ching <micky_ching@realsil.com.cn> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Tested-by: Mauro Santos <registo.mailling@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/rtsx_pci_sdmmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index 93137483ecde..6158b96cdd47 100644
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@ -244,7 +244,7 @@ static void sd_send_cmd_get_rsp(struct realtek_pci_sdmmc *host,
stat_idx = sd_status_index(rsp_type);
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_pci_write_register(pcr, SD_BUS_STAT,