summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/imxmmc.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-06-04 17:51:15 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-06-19 13:05:08 +0100
commita3fd4a1b9ced850ac1a9d5bb9f8fab494d07f3fa (patch)
treedc2b9354fe087663cc862a966d12824601702c29 /drivers/mmc/imxmmc.c
parent12223dabc617a4babfba4e17feb1ed88e8cfeb8f (diff)
downloadlinux-a3fd4a1b9ced850ac1a9d5bb9f8fab494d07f3fa.tar.gz
linux-a3fd4a1b9ced850ac1a9d5bb9f8fab494d07f3fa.tar.bz2
linux-a3fd4a1b9ced850ac1a9d5bb9f8fab494d07f3fa.zip
[MMC] Convert all hosts except mmci to use data->blksz
The MMC specification allows non-power of two block sizes. As such, we should not pass the log2 block size to host drivers, but instead pass the byte size. However, ARM MMCI can only work with log2 block size, so continue to pass both the log2 block size and byte block size. This means that for the moment, the byte block size must remain a power of two, but this is the first stage of removing this restriction for other hosts. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc/imxmmc.c')
-rw-r--r--drivers/mmc/imxmmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/imxmmc.c
index a4eb1d0e7a71..5c62f4e6ad06 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;