2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index b56d72ff06e9..34e23489811a 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -384,7 +384,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev)
                                 u16 val[2] = {0, 0};
                                 val[0] = mvsd_read(MVSD_FIFO);
                                 val[1] = mvsd_read(MVSD_FIFO);
-                                memcpy(p, &val, s);
+                                memcpy(p, ((void *)&val) + 4 - s, s);
                                 s = 0;
                                 intr_status = mvsd_read(MVSD_NOR_INTR_STATUS);
                         }
@@ -423,7 +423,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev)
                 if (s < 4) {
                         if (s && (intr_status & MVSD_NOR_TX_AVAIL)) {
                                 u16 val[2] = {0, 0};
-                                memcpy(&val, p, s);
+                                memcpy(((void *)&val) + 4 - s, p, s);
                                 mvsd_write(MVSD_FIFO, val[0]);
                                 mvsd_write(MVSD_FIFO, val[1]);
                                 s = 0;
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index d7d7109ef47e..e55ac792d68c 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -168,12 +168,12 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data)
 
         if (data->flags & MMC_DATA_READ) {
                 host->dma_dir = DMA_FROM_DEVICE;
-                dcmd = DCMD_INCTRGADDR | DCMD_FLOWTRG;
+                dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC;
                 DRCMR(host->dma_drcmrtx) = 0;
                 DRCMR(host->dma_drcmrrx) = host->dma | DRCMR_MAPVLD;
         } else {
                 host->dma_dir = DMA_TO_DEVICE;
-                dcmd = DCMD_INCSRCADDR | DCMD_FLOWSRC;
+                dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
                 DRCMR(host->dma_drcmrrx) = 0;
                 DRCMR(host->dma_drcmrtx) = host->dma | DRCMR_MAPVLD;
         }