diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-09 14:00:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-09 14:00:44 -0800 |
| commit | 687530b44de7e0fe70fabb4200d4cabce3af1a0c (patch) | |
| tree | 0ffb4bedbd51c89c1456fc38319c598ecb203df0 /drivers | |
| parent | 78833dd70602be6b71ef34225f708b1e500947dc (diff) | |
| parent | bad3babace2ee4d1763b4016a662a5c660ab92e9 (diff) | |
| download | linux-687530b44de7e0fe70fabb4200d4cabce3af1a0c.tar.gz linux-687530b44de7e0fe70fabb4200d4cabce3af1a0c.tar.bz2 linux-687530b44de7e0fe70fabb4200d4cabce3af1a0c.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 6625c057be05..150b5f3cd401 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); /* |