mmc: msm_sdcc: Don't set host->curr.mrq until after we're sure the busclk timer won't fire

Signed-off-by: San Mehat <san@google.com>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
This commit is contained in:
Dmitry Shmidt 2009-12-02 17:21:07 -08:00 committed by Daniel Walker
parent 24bbd7d5b4
commit 91bb64952a

View File

@ -853,8 +853,6 @@ msmsdcc_request(struct mmc_host *mmc, struct mmc_request *mrq)
return; return;
} }
host->curr.mrq = mrq;
/* Need to drop the host lock here in case /* Need to drop the host lock here in case
* the busclk wd fires * the busclk wd fires
*/ */
@ -863,6 +861,8 @@ msmsdcc_request(struct mmc_host *mmc, struct mmc_request *mrq)
msmsdcc_enable_clocks(host); msmsdcc_enable_clocks(host);
spin_lock_irqsave(&host->lock, flags); spin_lock_irqsave(&host->lock, flags);
host->curr.mrq = mrq;
if (mrq->data && mrq->data->flags & MMC_DATA_READ) if (mrq->data && mrq->data->flags & MMC_DATA_READ)
/* Queue/read data, daisy-chain command when data starts */ /* Queue/read data, daisy-chain command when data starts */
msmsdcc_start_data(host, mrq->data, mrq->cmd, 0); msmsdcc_start_data(host, mrq->data, mrq->cmd, 0);