diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
| commit | c6a756795d5ba0637aae8da89dd11bb7e3a1ee74 (patch) | |
| tree | 1c19f951f2604dbb6b867a6dcdf94d20c204cc5c /drivers/mmc/pxamci.c | |
| parent | 382066da251132f768380f4852ed5afb72d88f80 (diff) | |
| parent | a8bd60705aa17a998516837d9c1e503ad4cbd7fc (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/mmc/pxamci.c')
| -rw-r--r-- | drivers/mmc/pxamci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index f97b472085cb..b49368fd96b8 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c | |||
| @@ -119,7 +119,7 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data) | |||
| 119 | nob = 0xffff; | 119 | nob = 0xffff; |
| 120 | 120 | ||
| 121 | writel(nob, host->base + MMC_NOB); | 121 | writel(nob, host->base + MMC_NOB); |
| 122 | writel(1 << data->blksz_bits, host->base + MMC_BLKLEN); | 122 | writel(data->blksz, host->base + MMC_BLKLEN); |
| 123 | 123 | ||
| 124 | clks = (unsigned long long)data->timeout_ns * CLOCKRATE; | 124 | clks = (unsigned long long)data->timeout_ns * CLOCKRATE; |
| 125 | do_div(clks, 1000000000UL); | 125 | do_div(clks, 1000000000UL); |
| @@ -283,7 +283,7 @@ static int pxamci_data_done(struct pxamci_host *host, unsigned int stat) | |||
| 283 | * data blocks as being in error. | 283 | * data blocks as being in error. |
| 284 | */ | 284 | */ |
| 285 | if (data->error == MMC_ERR_NONE) | 285 | if (data->error == MMC_ERR_NONE) |
| 286 | data->bytes_xfered = data->blocks << data->blksz_bits; | 286 | data->bytes_xfered = data->blocks * data->blksz; |
| 287 | else | 287 | else |
| 288 | data->bytes_xfered = 0; | 288 | data->bytes_xfered = 0; |
| 289 | 289 | ||