MMC fix for 2.6.38

Linus,

Please pull from:

git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git for-linus

for a final MMC regression fix against -rc1. Thanks.

The following changes since commit 214d93b02c4fe93638ad268613c9702a81ed9192:
Linus Torvalds (1):
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/.../tmlind/linux-omap-2.6

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git for-linus

Ohad Ben-Cohen (1):
mmc: fix CONFIG_MMC_UNSAFE_RESUME regression

 drivers/mmc/core/core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

From: Ohad Ben-Cohen <[email protected]>
Date: Tue, 8 Mar 2011 23:32:02 +0200
Subject: [PATCH] mmc: fix CONFIG_MMC_UNSAFE_RESUME regression

30201e7f3 ("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.

---
 drivers/mmc/core/core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 6625c05..150b5f3 100644
@@ -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);
 
 	/*

Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child