]> err.no Git - linux-2.6/commitdiff
mmc-atmel: remove linux/mmc/protocol.h dependencies
authorMarc Pignat <marc.pignat@hevs.ch>
Wed, 6 Jun 2007 18:27:59 +0000 (20:27 +0200)
committerPierre Ossman <drzeus@drzeus.cx>
Thu, 7 Jun 2007 07:25:47 +0000 (09:25 +0200)
Fix compilation error by removing command decoding from at91_mci.c driver.
Decoding commands in the host driver is the wrong way.

Signed-off-by: Marc Pignat <marc.pignat@hevs.ch>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
drivers/mmc/host/at91_mci.c

index e37943c314cbd7c954208130921349501db8cb18..5b00c194b6285a0bb76e7101765bf60bedceaf55 100644 (file)
@@ -417,7 +417,7 @@ static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_
                blocks = 0;
        }
 
-       if (cmd->opcode == MMC_STOP_TRANSMISSION)
+       if (host->flags & FL_SENT_STOP)
                cmdr |= AT91_MCI_TRCMD_STOP;
 
        if (host->bus_mode == MMC_BUSMODE_OPENDRAIN)
@@ -563,8 +563,7 @@ static void at91mci_completed_command(struct at91mci_host *host)
        if (status & (AT91_MCI_RINDE | AT91_MCI_RDIRE | AT91_MCI_RCRCE |
                        AT91_MCI_RENDE | AT91_MCI_RTOE | AT91_MCI_DCRCE |
                        AT91_MCI_DTOE | AT91_MCI_OVRE | AT91_MCI_UNRE)) {
-               if ((status & AT91_MCI_RCRCE) &&
-                       ((cmd->opcode == MMC_SEND_OP_COND) || (cmd->opcode == SD_APP_OP_COND))) {
+               if ((status & AT91_MCI_RCRCE) && !(mmc_resp_type(cmd) & MMC_RSP_CRC)) {
                        cmd->error = MMC_ERR_NONE;
                }
                else {