lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

omap_hsmmc: Do dma cleanup also with data CRC errors

Browse Source 
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
Jarkko Lavinen
2008-12-05 12:31:46 +02:00
committed by Pierre Ossman
parent 2a69567b87
commit 82788ff532
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mmc/host/omap_hsmmc.c
View File

@@ -332,9 +332,9 @@ mmc_omap_cmd_done(struct mmc_omap_host *host, struct mmc_command *cmd)
/* /*
* DMA clean up for command errors * DMA clean up for command errors
*/ */
static void mmc_dma_cleanup(struct mmc_omap_host *host) static void mmc_dma_cleanup(struct mmc_omap_host *host, int errno)
{ {
host->data->error = -ETIMEDOUT; host->data->error = errno;
if (host->use_dma && host->dma_ch != -1) { if (host->use_dma && host->dma_ch != -1) {
dma_unmap_sg(mmc_dev(host->mmc), host->data->sg, host->dma_len, dma_unmap_sg(mmc_dev(host->mmc), host->data->sg, host->dma_len,
@@ -439,7 +439,7 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
end_cmd = 1; end_cmd = 1;
} }
if (host->data) { if (host->data) {
mmc_dma_cleanup(host); mmc_dma_cleanup(host, -ETIMEDOUT);
mmc_omap_reset_controller_fsm(host, SRD); mmc_omap_reset_controller_fsm(host, SRD);
} }
} }
@@ -447,9 +447,9 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
(status & DATA_CRC)) { (status & DATA_CRC)) {
if (host->data) { if (host->data) {
if (status & DATA_TIMEOUT) if (status & DATA_TIMEOUT)
mmc_dma_cleanup(host); mmc_dma_cleanup(host, -ETIMEDOUT);
else else
host->data->error = -EILSEQ; mmc_dma_cleanup(host, -EILSEQ);
mmc_omap_reset_controller_fsm(host, SRD); mmc_omap_reset_controller_fsm(host, SRD);
end_trans = 1; end_trans = 1;
} }