3 files changed, 11 insertions, 8 deletions

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 3b3cd0e74715..dead61754ad7 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -119,7 +119,7 @@ config MMC_TIFM_SD
 
 config MMC_SPI
         tristate "MMC/SD over SPI"
-        depends on MMC && SPI_MASTER && !HIGHMEM
+        depends on MMC && SPI_MASTER && !HIGHMEM && HAS_DMA
         select CRC7
         select CRC_ITU_T
         help
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index a28fc2f68ce2..8979ad330a4d 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -663,9 +663,12 @@ static void at91_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                                 gpio_set_value(host->board->vcc_pin, 0);
                                 break;
                         case MMC_POWER_UP:
-                        case MMC_POWER_ON:
                                 gpio_set_value(host->board->vcc_pin, 1);
                                 break;
+                        case MMC_POWER_ON:
+                                break;
+                        default:
+                                WARN_ON(1);
                 }
         }
 }
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 14759e9f42ad..549517c35675 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1003,7 +1003,7 @@ static void mmc_omap_dma_cb(int lch, u16 ch_status, void *data)
 
 static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data *data)
 {
-        const char *dev_name;
+        const char *dma_dev_name;
         int sync_dev, dma_ch, is_read, r;
 
         is_read = !(data->flags & MMC_DATA_WRITE);
@@ -1018,21 +1018,21 @@ static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data
         if (is_read) {
                 if (host->id == 1) {
                         sync_dev = OMAP_DMA_MMC_RX;
-                        dev_name = "MMC1 read";
+                        dma_dev_name = "MMC1 read";
                 } else {
                         sync_dev = OMAP_DMA_MMC2_RX;
-                        dev_name = "MMC2 read";
+                        dma_dev_name = "MMC2 read";
                 }
         } else {
                 if (host->id == 1) {
                         sync_dev = OMAP_DMA_MMC_TX;
-                        dev_name = "MMC1 write";
+                        dma_dev_name = "MMC1 write";
                 } else {
                         sync_dev = OMAP_DMA_MMC2_TX;
-                        dev_name = "MMC2 write";
+                        dma_dev_name = "MMC2 write";
                 }
         }
-        r = omap_request_dma(sync_dev, dev_name, mmc_omap_dma_cb,
+        r = omap_request_dma(sync_dev, dma_dev_name, mmc_omap_dma_cb,
                              host, &dma_ch);
         if (r != 0) {
                 dev_dbg(mmc_dev(host->mmc), "omap_request_dma() failed with %d\n", r);