diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2007-08-12 13:13:24 +0200 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-08-23 06:27:44 +0200 |
| commit | 2b061973404802fb87db93175b856ee0dfbe38e4 (patch) | |
| tree | 9d44303c71725ec80da3b90c2e33f0fc8d22741b /drivers/mmc | |
| parent | be760a9de881d84994403bb93177bcb95319c4cb (diff) | |
| download | kernel_samsung_smdk4412-2b061973404802fb87db93175b856ee0dfbe38e4.zip kernel_samsung_smdk4412-2b061973404802fb87db93175b856ee0dfbe38e4.tar.gz kernel_samsung_smdk4412-2b061973404802fb87db93175b856ee0dfbe38e4.tar.bz2 | |
sdhci: be more cautious about block count register
The block count register shouldn't be trusted for single block transfers,
so avoid using it completely when calculating transferred bytes.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index f2bc87a..7181e86 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -477,8 +477,8 @@ static void sdhci_finish_data(struct sdhci_host *host) /* * Controller doesn't count down when in single block mode. */ - if ((data->blocks == 1) && (data->error == MMC_ERR_NONE)) - blocks = 0; + if (data->blocks == 1) + blocks = (data->error == MMC_ERR_NONE) ? 0 : 1; else blocks = readw(host->ioaddr + SDHCI_BLOCK_COUNT); data->bytes_xfered = data->blksz * (data->blocks - blocks); |