Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f0ea0bd authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci-omap: Fix timeout checks 



Always check the wait condition before returning timeout.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent ea6d0273

drivers/mmc/host/sdhci-omap.c

+12 −4
Original line number Diff line number Diff line
@@ -221,8 +221,12 @@ static void sdhci_omap_conf_bus_power(struct sdhci_omap_host *omap_host, 


	/* wait 1ms */

	timeout = ktime_add_ms(ktime_get(), SDHCI_OMAP_TIMEOUT);

	while (!(sdhci_omap_readl(omap_host, SDHCI_OMAP_HCTL) & HCTL_SDBP)) {

		if (WARN_ON(ktime_after(ktime_get(), timeout)))

	while (1) {

		bool timedout = ktime_after(ktime_get(), timeout);



		if (sdhci_omap_readl(omap_host, SDHCI_OMAP_HCTL) & HCTL_SDBP)

			break;

		if (WARN_ON(timedout))

			return;

		usleep_range(5, 10);

	}
@@ -655,8 +659,12 @@ static void sdhci_omap_init_74_clocks(struct sdhci_host *host, u8 power_mode) 


	/* wait 1ms */

	timeout = ktime_add_ms(ktime_get(), SDHCI_OMAP_TIMEOUT);

	while (!(sdhci_omap_readl(omap_host, SDHCI_OMAP_STAT) & INT_CC_EN)) {

		if (WARN_ON(ktime_after(ktime_get(), timeout)))

	while (1) {

		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;

		usleep_range(5, 10);

	}