diff options
Diffstat (limited to 'drivers/mmc/omap.c')
| -rw-r--r-- | drivers/mmc/omap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index becb3c68c34d..c25244b3657b 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c | |||
| @@ -584,10 +584,10 @@ mmc_omap_prepare_dma(struct mmc_omap_host *host, struct mmc_data *data) | |||
| 584 | int sync_dev = 0; | 584 | int sync_dev = 0; |
| 585 | 585 | ||
| 586 | data_addr = io_v2p((u32) host->base) + OMAP_MMC_REG_DATA; | 586 | data_addr = io_v2p((u32) host->base) + OMAP_MMC_REG_DATA; |
| 587 | frame = 1 << data->blksz_bits; | 587 | frame = data->blksz; |
| 588 | count = sg_dma_len(sg); | 588 | count = sg_dma_len(sg); |
| 589 | 589 | ||
| 590 | if ((data->blocks == 1) && (count > (1 << data->blksz_bits))) | 590 | if ((data->blocks == 1) && (count > data->blksz)) |
| 591 | count = frame; | 591 | count = frame; |
| 592 | 592 | ||
| 593 | host->dma_len = count; | 593 | host->dma_len = count; |
| @@ -776,7 +776,7 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req) | |||
| 776 | } | 776 | } |
| 777 | 777 | ||
| 778 | 778 | ||
| 779 | block_size = 1 << data->blksz_bits; | 779 | block_size = data->blksz; |
| 780 | 780 | ||
| 781 | OMAP_MMC_WRITE(host->base, NBLK, data->blocks - 1); | 781 | OMAP_MMC_WRITE(host->base, NBLK, data->blocks - 1); |
| 782 | OMAP_MMC_WRITE(host->base, BLEN, block_size - 1); | 782 | OMAP_MMC_WRITE(host->base, BLEN, block_size - 1); |
