diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-02-16 16:48:31 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2006-02-16 16:48:31 +0000 |
| commit | 0425a14213f373595bd23cacdc675f2b973a28d4 (patch) | |
| tree | e575c9628b9aaf847469875aecec92afa6de8e47 /drivers/mmc | |
| parent | [PATCH] neofb: avoid resetting display config on unblank (diff) | |
| download | linux-dev-0425a14213f373595bd23cacdc675f2b973a28d4.tar.xz linux-dev-0425a14213f373595bd23cacdc675f2b973a28d4.zip | |
[MMC] mmci: allow small data transfers
If a data transfer is small (less than a FIFO size) we would
hang waiting for the data to be read due to the PIO interrupt
not occuring. We allowed for this in our PIO interrupt handler,
but not when setting up a data transfer.
Apply the "fix" when setting up a data transfer as well.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/mmci.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c index 37ee7f8dc82f..9fef29d978b5 100644 --- a/drivers/mmc/mmci.c +++ b/drivers/mmc/mmci.c @@ -97,6 +97,13 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data) if (data->flags & MMC_DATA_READ) { datactrl |= MCI_DPSM_DIRECTION; irqmask = MCI_RXFIFOHALFFULLMASK; + + /* + * If we have less than a FIFOSIZE of bytes to transfer, + * trigger a PIO interrupt as soon as any data is available. + */ + if (host->size < MCI_FIFOSIZE) + irqmask |= MCI_RXDATAAVLBLMASK; } else { /* * We don't actually need to include "FIFO empty" here |