Commit 5c671c41 authored Nov 26, 2015 by Adrian Hunter Committed by Ulf Hansson Dec 22, 2015

mmc: sdhci: Fix sdhci_runtime_pm_bus_on/off()



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: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org # v3.11+
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 04a5ae6f

drivers/mmc/host/sdhci.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2755,7 +2755,7 @@ static int sdhci_runtime_pm_put(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;
		host->bus_on = true;
		pm_runtime_get_noresume(host->mmc->parent);
		@@ -2763,7 +2763,7 @@ static void sdhci_runtime_pm_bus_on(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;
		host->bus_on = false;
		pm_runtime_put_noidle(host->mmc->parent);

Admin message