diff options
| author |   Ulf Hansson <ulf.hansson@linaro.org> | 2018-03-05 13:04:37 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2018-03-05 13:04:37 +0100 |
| commit | 611d059f1a136dcb76a68eb715dc5c66d8a0a3fd (patch) | |
| tree | 1e256a8cb690901b83a630d808ede5ba1edcf404 | |
| parent | mmc: mediatek: add support for MT7622 SoC (diff) | |
| parent | mmc: dw_mmc: Fix the DTO/CTO timeout overflow calculation for 32-bit systems (diff) | |
| download | linux-dev-611d059f1a136dcb76a68eb715dc5c66d8a0a3fd.tar.xz linux-dev-611d059f1a136dcb76a68eb715dc5c66d8a0a3fd.zip | |
Merge branch 'fixes' into next
| -rw-r--r-- | drivers/mmc/host/dw_mmc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index aecc3e255507..09ed242de464 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -389,7 +389,9 @@ static inline void dw_mci_set_cto(struct dw_mci *host) cto_div = (mci_readl(host, CLKDIV) & 0xff) * 2; if (cto_div == 0) cto_div = 1; - cto_ms = DIV_ROUND_UP(MSEC_PER_SEC * cto_clks * cto_div, host->bus_hz); + + cto_ms = DIV_ROUND_UP_ULL((u64)MSEC_PER_SEC * cto_clks * cto_div, + host->bus_hz); /* add a bit spare time */ cto_ms += 10; @@ -1924,8 +1926,9 @@ static void dw_mci_set_drto(struct dw_mci *host) drto_div = (mci_readl(host, CLKDIV) & 0xff) * 2; if (drto_div == 0) drto_div = 1; - drto_ms = DIV_ROUND_UP(MSEC_PER_SEC * drto_clks * drto_div, - host->bus_hz); + + drto_ms = DIV_ROUND_UP_ULL((u64)MSEC_PER_SEC * drto_clks * drto_div, + host->bus_hz); /* add a bit spare time */ drto_ms += 10; |