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

Commit 3bffb800 authored Apr 08, 2013 by Li Fei Committed by Chris Ball Apr 12, 2013

mmc: core: call pm_runtime_put_noidle in pm_runtime_get_sync failed case



Even in failed case of pm_runtime_get_sync, the usage_count
is incremented. In order to keep the usage_count with correct
value and runtime power management to behave correctly, call
pm_runtime_put_noidle in such case.

Signed-off-by: Liu Chuansheng <chuansheng.liu@intel.com>
Signed-off-by: Li Fei <fei.li@intel.com>
Acked-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent abd4190f

drivers/mmc/core/sdio.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -861,9 +861,11 @@ static void mmc_sdio_detect(struct mmc_host *host)
		/* Make sure card is powered before detecting it */
		if (host->caps & MMC_CAP_POWER_OFF_CARD) {
		err = pm_runtime_get_sync(&host->card->dev);
		if (err < 0)
		if (err < 0) {
		pm_runtime_put_noidle(&host->card->dev);
		goto out;
		}
		}

		mmc_claim_host(host);

drivers/mmc/core/sdio_bus.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@ static int sdio_bus_probe(struct device *dev)
		if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD) {
		ret = pm_runtime_get_sync(dev);
		if (ret < 0)
		goto out;
		goto disable_runtimepm;
		}

		/* Set the default block size so the driver is sure it's something
		@@ -158,7 +158,6 @@ static int sdio_bus_probe(struct device *dev)
		disable_runtimepm:
		if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
		pm_runtime_put_noidle(dev);
		out:
		return ret;
		}