Commit c35e02fb authored by Adrian Hunter's avatar Adrian Hunter Committed by Luis Henriques

mmc: sdhci: Fix sdhci_runtime_pm_bus_on/off()

commit 5c671c41 upstream.

sdhci has a legacy facility to prevent runtime suspend if the
bus power is on.  This is needed in cases where the power to
the card is dependent on the bus power.  It is controlled by
a pair of functions: sdhci_runtime_pm_bus_on() and
sdhci_runtime_pm_bus_off().  These functions use a boolean
variable 'bus_on' to ensure changes are always paired.
There is an additional check for 'runtime_suspended' which is
the problem.  In fact, its use is ill-conceived as the only
requirement for the logic is that 'on' and 'off' are paired,
which is actually broken by the check, for example if the bus
power is turned on during runtime resume.  So remove  the check.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 926c0116
...@@ -2632,7 +2632,7 @@ static int sdhci_runtime_pm_put(struct sdhci_host *host) ...@@ -2632,7 +2632,7 @@ static int sdhci_runtime_pm_put(struct sdhci_host *host)
static void sdhci_runtime_pm_bus_on(struct sdhci_host *host) static void sdhci_runtime_pm_bus_on(struct sdhci_host *host)
{ {
if (host->runtime_suspended || host->bus_on) if (host->bus_on)
return; return;
host->bus_on = true; host->bus_on = true;
pm_runtime_get_noresume(host->mmc->parent); pm_runtime_get_noresume(host->mmc->parent);
...@@ -2640,7 +2640,7 @@ static void sdhci_runtime_pm_bus_on(struct sdhci_host *host) ...@@ -2640,7 +2640,7 @@ static void sdhci_runtime_pm_bus_on(struct sdhci_host *host)
static void sdhci_runtime_pm_bus_off(struct sdhci_host *host) static void sdhci_runtime_pm_bus_off(struct sdhci_host *host)
{ {
if (host->runtime_suspended || !host->bus_on) if (!host->bus_on)
return; return;
host->bus_on = false; host->bus_on = false;
pm_runtime_put_noidle(host->mmc->parent); pm_runtime_put_noidle(host->mmc->parent);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment