git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'stable/ia64', 'stable/blkfront-cleanup' and 'stable/cleanup' of git...
[pandora-kernel.git]
/
drivers
/
mmc
/
core
/
core.c
diff --git
a/drivers/mmc/core/core.c
b/drivers/mmc/core/core.c
index
6625c05
..
150b5f3
100644
(file)
--- 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);
/*