diff options
| author | Tom Rini <trini@ti.com> | 2012-09-12 10:26:06 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-12 10:26:06 -0700 |
| commit | a9ae14fce312c65cb3d26710afdd9b64a868dafc (patch) | |
| tree | 4d4f7a5ebde03703e8689eb64298d447aefdc26b /drivers/mmc/pxa_mmc_gen.c | |
| parent | c60a57912a3efcdcc087422a1e9ce2dc1b61e39d (diff) | |
| parent | 95b01c47ed97a7ca8b59308e35fb8c21e8d996a5 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mmc
Diffstat (limited to 'drivers/mmc/pxa_mmc_gen.c')
| -rw-r--r-- | drivers/mmc/pxa_mmc_gen.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c index 2c5bf17bb3c..b3ec441b66a 100644 --- a/drivers/mmc/pxa_mmc_gen.c +++ b/drivers/mmc/pxa_mmc_gen.c @@ -118,7 +118,7 @@ static int pxa_mmc_start_cmd(struct mmc *mmc, struct mmc_cmd *cmd, int ret; /* The card can send a "busy" response */ - if (cmd->flags & MMC_RSP_BUSY) + if (cmd->resp_type & MMC_RSP_BUSY) cmdat |= MMC_CMDAT_BUSY; /* Inform the controller about response type */ @@ -181,9 +181,11 @@ static int pxa_mmc_cmd_done(struct mmc *mmc, struct mmc_cmd *cmd) /* The command response didn't arrive */ if (stat & MMC_STAT_TIME_OUT_RESPONSE) return -ETIMEDOUT; - else if (stat & MMC_STAT_RES_CRC_ERROR && cmd->flags & MMC_RSP_CRC) { + else if (stat & MMC_STAT_RES_CRC_ERROR + && cmd->resp_type & MMC_RSP_CRC) { #ifdef PXAMMC_CRC_SKIP - if (cmd->flags & MMC_RSP_136 && cmd->response[0] & (1 << 31)) + if (cmd->resp_type & MMC_RSP_136 + && cmd->response[0] & (1 << 31)) printf("Ignoring CRC, this may be dangerous!\n"); else #endif |