diff options
| author |   Cliff Brake <cbrake@bec-systems.com> | 2009-01-22 16:58:58 -0500 |
|---|---|---|
| committer |   Pierre Ossman <drzeus@drzeus.cx> | 2009-02-02 20:57:06 +0100 |
| commit | e10a854c4602072c34c03380b99da0a3ee15682c (patch) | |
| tree | 4368b952ecfeb7de6bbabca21d0c36b547d4e1f8 /drivers/mmc/host/pxamci.c | |
| parent | ricoh_mmc: Use suspend_late/resume_early (diff) | |
| download | linux-dev-e10a854c4602072c34c03380b99da0a3ee15682c.tar.xz linux-dev-e10a854c4602072c34c03380b99da0a3ee15682c.zip | |
pxamci: replace #ifdef CONFIG_PXA27x with if (cpu_is_pxa27x())
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>
Diffstat (limited to 'drivers/mmc/host/pxamci.c')
| -rw-r--r-- | drivers/mmc/host/pxamci.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 3c5483b75da4..3000422f4d81 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -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); |