Commit 297c7f2f authored Jun 09, 2011 by Ohad Ben-Cohen Committed by Chris Ball Jun 25, 2011

mmc: sdio: fix runtime PM path during driver removal



After commit e1866b33 "PM / Runtime: Rework runtime PM handling
during driver removal" was introduced, the driver core stopped
incrementing the runtime PM usage counter of the device during
the invocation of the ->remove() callback.

This indirectly broke SDIO's runtime PM path during driver removal,
because no one calls _put_sync() anymore after ->remove() completes.

This means that the power of runtime-PM-managed SDIO cards is kept
high after their driver is removed (even if it was powered down
beforehand).

Fix that by directly calling _put_sync() when the last usage
counter is downref'ed by the SDIO bus.

Reported-and-tested-by: Daniel Drake <dsd@laptop.org>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent be98ca65

drivers/mmc/core/sdio_bus.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -189,7 +189,7 @@ static int sdio_bus_remove(struct device *dev)

	/* Then undo the runtime PM settings in sdio_bus_probe() */		/* Then undo the runtime PM settings in sdio_bus_probe() */
	if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)		if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
	pm_runtime_put_noidle(dev);		pm_runtime_put_sync(dev);

	out:		out:
	return ret;		return ret;