Merge branch 'master'

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);
  */
 int mmc_resume_host(struct mmc_host *host)
 {
-        mmc_detect_change(host, 0);
+        mmc_rescan(host);
 
         return 0;
 }
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)
         if (host->dma_addr)
                 dma_unmap_single(host->mmc->dev, host->dma_addr, WBSD_DMA_SIZE,
                         DMA_BIDIRECTIONAL);
-        if (host->dma_buffer)
-                kfree(host->dma_buffer);
+        kfree(host->dma_buffer);
         if (host->dma >= 0)
                 free_dma(host->dma);