diff options
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/arm_pl180_mmci.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/pxa_mmc_gen.c | 8 | 
2 files changed, 6 insertions, 4 deletions
| diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c index db2c7ab75..af1380a45 100644 --- a/drivers/mmc/arm_pl180_mmci.c +++ b/drivers/mmc/arm_pl180_mmci.c @@ -52,7 +52,7 @@ static int wait_for_command_end(struct mmc *dev, struct mmc_cmd *cmd)  		debug("CMD%d time out\n", cmd->cmdidx);  		return TIMEOUT;  	} else if ((hoststatus & SDI_STA_CCRCFAIL) && -		   (cmd->flags & MMC_RSP_CRC)) { +		   (cmd->resp_type & MMC_RSP_CRC)) {  		printf("CMD%d CRC error\n", cmd->cmdidx);  		return -EILSEQ;  	} diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c index 2c5bf17bb..b3ec441b6 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 |