Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/cjb/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: mmc: fix CONFIG_MMC_UNSAFE_RESUME regression
git-mirror · Mar 9, 2011 · 687530b · 687530b
2 parents 78833dd + bad3bab
commit 687530b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);
 
 	/*