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/imxmmc.c | |
| parent | 6f3cafce0ed24372084b5648c9e8a6aacbaf9900 (diff) | |
| parent | b44fb7a09e6bb7d77c1b4b402591f6f953c1e51c (diff) | |
| download | linux-3.10-8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6.tar.gz linux-3.10-8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6.tar.bz2 linux-3.10-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/imxmmc.c')
| -rw-r--r-- | drivers/mmc/imxmmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/imxmmc.c index a4eb1d0e7a7..5c62f4e6ad0 100644 --- a/drivers/mmc/imxmmc.c +++ b/drivers/mmc/imxmmc.c @@ -228,7 +228,7 @@ static int imxmci_busy_wait_for_status(struct imxmci_host *host, static void imxmci_setup_data(struct imxmci_host *host, struct mmc_data *data) { unsigned int nob = data->blocks; - unsigned int blksz = 1 << data->blksz_bits; + unsigned int blksz = data->blksz; unsigned int datasz = nob * blksz; int i; |