diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-22 22:47:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-22 22:47:06 -0700 |
| commit | 8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6 (patch) | |
| tree | a02ec337d6d6e4b30cd0b4d8968116a32c59357c /drivers/mmc/omap.c | |
| parent | 6f3cafce0ed24372084b5648c9e8a6aacbaf9900 (diff) | |
| parent | b44fb7a09e6bb7d77c1b4b402591f6f953c1e51c (diff) | |
| download | blackbird-op-linux-8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6.tar.gz blackbird-op-linux-8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6.zip | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc:
[ARM] 3565/1: AT91RM9200 MMC update
[MMC] Convert all hosts except mmci to use data->blksz
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) int sync_dev = 0; data_addr = io_v2p((u32) host->base) + OMAP_MMC_REG_DATA; - frame = 1 << data->blksz_bits; + frame = data->blksz; count = sg_dma_len(sg); - if ((data->blocks == 1) && (count > (1 << data->blksz_bits))) + if ((data->blocks == 1) && (count > data->blksz)) count = frame; host->dma_len = count; @@ -776,7 +776,7 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req) } - block_size = 1 << data->blksz_bits; + block_size = data->blksz; OMAP_MMC_WRITE(host->base, NBLK, data->blocks - 1); OMAP_MMC_WRITE(host->base, BLEN, block_size - 1); |
