diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 17:12:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 17:12:44 -0400 |
commit | c2f73fd07d2ce4605b404f34395eb734a7ba9967 (patch) | |
tree | 4428204f4be7c7dfa55d674647c358ebc452063d /drivers/mmc/host/at91_mci.c | |
parent | d20ead9e86881bc7ae84e385f47b5196b7d93aac (diff) | |
parent | 727c26ed78b8f2b07452cf8bc9a07ff3f302ab48 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
net: libertas sdio driver
mmc: at91_mci: cleanup: use MCI_ERRORS
mmc: possible leak in mmc_read_ext_csd
Diffstat (limited to 'drivers/mmc/host/at91_mci.c')
-rw-r--r-- | drivers/mmc/host/at91_mci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index 6ba98a49612d..7a452c2ad1f9 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c | |||
@@ -581,9 +581,7 @@ static void at91_mci_completed_command(struct at91mci_host *host) | |||
581 | pr_debug("Status = %08X [%08X %08X %08X %08X]\n", | 581 | pr_debug("Status = %08X [%08X %08X %08X %08X]\n", |
582 | status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]); | 582 | status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]); |
583 | 583 | ||
584 | if (status & (AT91_MCI_RINDE | AT91_MCI_RDIRE | AT91_MCI_RCRCE | | 584 | if (status & AT91_MCI_ERRORS) { |
585 | AT91_MCI_RENDE | AT91_MCI_RTOE | AT91_MCI_DCRCE | | ||
586 | AT91_MCI_DTOE | AT91_MCI_OVRE | AT91_MCI_UNRE)) { | ||
587 | if ((status & AT91_MCI_RCRCE) && !(mmc_resp_type(cmd) & MMC_RSP_CRC)) { | 585 | if ((status & AT91_MCI_RCRCE) && !(mmc_resp_type(cmd) & MMC_RSP_CRC)) { |
588 | cmd->error = 0; | 586 | cmd->error = 0; |
589 | } | 587 | } |