Skip to content

Commit

Permalink
pxamci: replace #ifdef CONFIG_PXA27x with if (cpu_is_pxa27x())
Browse files Browse the repository at this point in the history
Signed-off-by: Cliff Brake <cbrake@bec-systems.com>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
  • Loading branch information
Cliff Brake authored and Pierre Ossman committed Feb 2, 2009
1 parent 06cc1c8 commit e10a854
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/mmc/host/pxamci.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,18 +251,17 @@ static int pxamci_cmd_done(struct pxamci_host *host, unsigned int stat)
if (stat & STAT_TIME_OUT_RESPONSE) {
cmd->error = -ETIMEDOUT;
} else if (stat & STAT_RES_CRC_ERR && cmd->flags & MMC_RSP_CRC) {
#ifdef CONFIG_PXA27x
/*
* workaround for erratum #42:
* Intel PXA27x Family Processor Specification Update Rev 001
* A bogus CRC error can appear if the msb of a 136 bit
* response is a one.
*/
if (cmd->flags & MMC_RSP_136 && cmd->resp[0] & 0x80000000) {
if (cpu_is_pxa27x() &&
(cmd->flags & MMC_RSP_136 && cmd->resp[0] & 0x80000000))
pr_debug("ignoring CRC from command %d - *risky*\n", cmd->opcode);
} else
#endif
cmd->error = -EILSEQ;
else
cmd->error = -EILSEQ;
}

pxamci_disable_irq(host, END_CMD_RES);
Expand Down

0 comments on commit e10a854

Please sign in to comment.