diff options
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/mmc.c | 2 | ||||
-rw-r--r-- | drivers/mmc/wbsd.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index ceae379a4d4c..da528390acf8 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c | |||
@@ -1263,7 +1263,7 @@ EXPORT_SYMBOL(mmc_suspend_host); | |||
1263 | */ | 1263 | */ |
1264 | int mmc_resume_host(struct mmc_host *host) | 1264 | int mmc_resume_host(struct mmc_host *host) |
1265 | { | 1265 | { |
1266 | mmc_detect_change(host, 0); | 1266 | mmc_rescan(host); |
1267 | 1267 | ||
1268 | return 0; | 1268 | return 0; |
1269 | } | 1269 | } |
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 4ff67e7363d9..e954b8354fef 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c | |||
@@ -1602,8 +1602,7 @@ static void __devexit wbsd_release_dma(struct wbsd_host* host) | |||
1602 | if (host->dma_addr) | 1602 | if (host->dma_addr) |
1603 | dma_unmap_single(host->mmc->dev, host->dma_addr, WBSD_DMA_SIZE, | 1603 | dma_unmap_single(host->mmc->dev, host->dma_addr, WBSD_DMA_SIZE, |
1604 | DMA_BIDIRECTIONAL); | 1604 | DMA_BIDIRECTIONAL); |
1605 | if (host->dma_buffer) | 1605 | kfree(host->dma_buffer); |
1606 | kfree(host->dma_buffer); | ||
1607 | if (host->dma >= 0) | 1606 | if (host->dma >= 0) |
1608 | free_dma(host->dma); | 1607 | free_dma(host->dma); |
1609 | 1608 | ||