mirror of
https://github.com/torvalds/linux
synced 2024-10-08 04:12:40 +00:00
mmc: sdhci-omap: Fix timeout checks
Always check the wait condition before returning timeout. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Acked-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
ea6d027312
commit
9f0ea0bda1
|
@ -221,8 +221,12 @@ static void sdhci_omap_conf_bus_power(struct sdhci_omap_host *omap_host,
|
||||||
|
|
||||||
/* wait 1ms */
|
/* wait 1ms */
|
||||||
timeout = ktime_add_ms(ktime_get(), SDHCI_OMAP_TIMEOUT);
|
timeout = ktime_add_ms(ktime_get(), SDHCI_OMAP_TIMEOUT);
|
||||||
while (!(sdhci_omap_readl(omap_host, SDHCI_OMAP_HCTL) & HCTL_SDBP)) {
|
while (1) {
|
||||||
if (WARN_ON(ktime_after(ktime_get(), timeout)))
|
bool timedout = ktime_after(ktime_get(), timeout);
|
||||||
|
|
||||||
|
if (sdhci_omap_readl(omap_host, SDHCI_OMAP_HCTL) & HCTL_SDBP)
|
||||||
|
break;
|
||||||
|
if (WARN_ON(timedout))
|
||||||
return;
|
return;
|
||||||
usleep_range(5, 10);
|
usleep_range(5, 10);
|
||||||
}
|
}
|
||||||
|
@ -655,8 +659,12 @@ static void sdhci_omap_init_74_clocks(struct sdhci_host *host, u8 power_mode)
|
||||||
|
|
||||||
/* wait 1ms */
|
/* wait 1ms */
|
||||||
timeout = ktime_add_ms(ktime_get(), SDHCI_OMAP_TIMEOUT);
|
timeout = ktime_add_ms(ktime_get(), SDHCI_OMAP_TIMEOUT);
|
||||||
while (!(sdhci_omap_readl(omap_host, SDHCI_OMAP_STAT) & INT_CC_EN)) {
|
while (1) {
|
||||||
if (WARN_ON(ktime_after(ktime_get(), timeout)))
|
bool timedout = ktime_after(ktime_get(), timeout);
|
||||||
|
|
||||||
|
if (sdhci_omap_readl(omap_host, SDHCI_OMAP_STAT) & INT_CC_EN)
|
||||||
|
break;
|
||||||
|
if (WARN_ON(timedout))
|
||||||
return;
|
return;
|
||||||
usleep_range(5, 10);
|
usleep_range(5, 10);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue