diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-03-18 16:59:38 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-03-18 16:59:38 -0700 |
| commit | 3b79d3cc6c2783a5c8f962e4ad33b186894276f3 (patch) | |
| tree | c5496dd2525f642a8d1524718baad5ecc0f39ae0 /drivers/mmc | |
| parent | dd80664f6057b1adc64cd80e7cee2160e59c4704 (diff) | |
| parent | 47dc59f22a6af00691a98975d05a8a1601714e1b (diff) | |
Merge branch 'upstream/linaro.38' into linaro-android.38
Resolved Conflicts:
drivers/mmc/core/sdio.c
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/core.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/core/sdio.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 4cb6cdb71ff..63b9c4efd17 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1566,7 +1566,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); /* If the card was removed the bus will be marked diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index d4e6e6efbec..d7892386c94 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -845,6 +845,7 @@ int mmc_attach_sdio(struct mmc_host *host) if (err) goto remove_added; } + mmc_claim_host(host); return 0; |