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

[Russell King - ARM Linux]

On Tue, Jan 11, 2011 at 11:20:26PM +0000, Chris Ball wrote:
> 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.

FYI, I've now merged this into the ARM devel tree for the time being so
it doesn't get forgotten - which means it'll appear in linux-next at some
point if it isn't already there.  (Mainly so I don't have to keep on
adding the patch.)

Once you push it into mainline, I'll drop my copy.