Commit bad3baba authored Mar 08, 2011 by Ohad Ben-Cohen Committed by Chris Ball Mar 08, 2011

mmc: fix CONFIG_MMC_UNSAFE_RESUME regression



30201e7f ("mmc: skip detection of nonremovable cards on rescan")
allowed skipping detection of nonremovable cards on mmc_rescan().
The intention was to only skip detection of hardwired cards that
cannot be removed, so make sure this is indeed the case by directly
checking for (lack of) MMC_CAP_NONREMOVABLE, instead of using
mmc_card_is_removable(), which is overloaded with
CONFIG_MMC_UNSAFE_RESUME semantics.

The user-visible symptom of the bug this patch fixes is that no
"mmc: card XXXX removed" message appears in dmesg when a card is
removed and CONFIG_MMC_UNSAFE_RESUME=y.

Reported-and-tested-by: Dmitry Shmidt <dimitrysh@google.com>
Reported-and-tested-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent 214d93b0

drivers/mmc/core/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1529,7 +1529,7 @@ void mmc_rescan(struct work_struct *work)
		* still present
		*/
		if (host->bus_ops && host->bus_ops->detect && !host->bus_dead
		&& mmc_card_is_removable(host))
		&& !(host->caps & MMC_CAP_NONREMOVABLE))
		host->bus_ops->detect(host);

		/*

Admin message