30201e7 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.
Reported-and-tested-by: Dmitry Shmidt <dimitr...@google.com>
Reported-and-tested-by: Maxim Levitsky <maximlevit...@gmail.com>
Signed-off-by: Ohad Ben-Cohen <o...@wizery.com>
Cc: <sta...@kernel.org>
---
Based on linux-2.6.git master, as this should probably go to Linus.
drivers/mmc/core/core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 6625c05..150b5f3 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -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);
/*
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
