[PATCH] MMCI: don't read command response when invalid

Chris Ball cjb at laptop.org
Tue Jan 11 18:20:26 EST 2011


Hi,

On Tue, Jan 11, 2011 at 04:35:56PM +0000, Russell King - ARM Linux wrote:
> Don't read the command response from the registers when either the
> command timed out (because there was no response from the card) or
> the checksum on the response was invalid.
> 
> Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
> ---
>  drivers/mmc/host/mmci.c |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
> index 5630228..040de4f 100644
> --- a/drivers/mmc/host/mmci.c
> +++ b/drivers/mmc/host/mmci.c
> @@ -394,15 +394,15 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,
>  
>  	host->cmd = NULL;
>  
> -	cmd->resp[0] = readl(base + MMCIRESPONSE0);
> -	cmd->resp[1] = readl(base + MMCIRESPONSE1);
> -	cmd->resp[2] = readl(base + MMCIRESPONSE2);
> -	cmd->resp[3] = readl(base + MMCIRESPONSE3);
> -
>  	if (status & MCI_CMDTIMEOUT) {
>  		cmd->error = -ETIMEDOUT;
>  	} else if (status & MCI_CMDCRCFAIL && cmd->flags & MMC_RSP_CRC) {
>  		cmd->error = -EILSEQ;
> +	} else {
> +		cmd->resp[0] = readl(base + MMCIRESPONSE0);
> +		cmd->resp[1] = readl(base + MMCIRESPONSE1);
> +		cmd->resp[2] = readl(base + MMCIRESPONSE2);
> +		cmd->resp[3] = readl(base + MMCIRESPONSE3);
>  	}
>  
>  	if (!cmd->data || cmd->error) {

Thanks, pushed to mmc-next and queued as a .38 fix.

-- 
Chris Ball   <cjb at laptop.org>   <http://printf.net/>
One Laptop Per Child



More information about the linux-arm-kernel mailing list