Skip to content

Commit

Permalink
mmc-omap: fix sd response type 6 vs. 1
Browse files Browse the repository at this point in the history
Ignoring OMAP_MMC_STAT_CARD_ERR, treating it as if the command
completed correctly.

Signed-off-by: Ragner Magalhaes <ragner.magalhaes@indt.org.br>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
  • Loading branch information
Ragner Magalhaes authored and Pierre Ossman committed Jun 13, 2007
1 parent a0e1d1d commit 0107a4b
Showing 1 changed file with 3 additions and 21 deletions.
24 changes: 3 additions & 21 deletions drivers/mmc/host/omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -522,28 +522,10 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
}

if (status & OMAP_MMC_STAT_CARD_ERR) {
if (host->cmd && host->cmd->opcode == MMC_STOP_TRANSMISSION) {
u32 response = OMAP_MMC_READ(host, RSP6)
| (OMAP_MMC_READ(host, RSP7) << 16);
/* STOP sometimes sets must-ignore bits */
if (!(response & (R1_CC_ERROR
| R1_ILLEGAL_COMMAND
| R1_COM_CRC_ERROR))) {
end_command = 1;
continue;
}
}

dev_dbg(mmc_dev(host->mmc), "card status error (CMD%d)\n",
dev_dbg(mmc_dev(host->mmc),
"ignoring card status error (CMD%d)\n",
host->cmd->opcode);
if (host->cmd) {
host->cmd->error = MMC_ERR_FAILED;
end_command = 1;
}
if (host->data) {
host->data->error = MMC_ERR_FAILED;
transfer_error = 1;
}
end_command = 1;
}

/*
Expand Down

0 comments on commit 0107a4b

Please sign in to comment.