summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-09 14:00:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-09 14:00:44 -0800
commit687530b44de7e0fe70fabb4200d4cabce3af1a0c (patch)
tree0ffb4bedbd51c89c1456fc38319c598ecb203df0 /drivers
parent78833dd70602be6b71ef34225f708b1e500947dc (diff)
parentbad3babace2ee4d1763b4016a662a5c660ab92e9 (diff)
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/core/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 6625c057be0..150b5f3cd40 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);
/*