aboutsummaryrefslogtreecommitdiff
path: root/drivers/mmc/host/msm_sdcc.c
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2009-12-02 17:21:07 -0800
committerDaniel Walker <dwalker@codeaurora.org>2010-03-18 13:37:21 -0700
commit91bb64952a8c57826b01878925bea8831c71a492 (patch)
tree346a725d560ff07087b9b8b88f9e3c13b60c053b /drivers/mmc/host/msm_sdcc.c
parent24bbd7d5b422cde6a149ac2f9ac6e61e66536532 (diff)
downloadvexpress-lsk-91bb64952a8c57826b01878925bea8831c71a492.tar.gz
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>
Diffstat (limited to 'drivers/mmc/host/msm_sdcc.c')
-rw-r--r--drivers/mmc/host/msm_sdcc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index d42a2dd6932..28899ee392e 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -853,8 +853,6 @@ msmsdcc_request(struct mmc_host *mmc, struct mmc_request *mrq)
return;
}
- host->curr.mrq = mrq;
-
/* Need to drop the host lock here in case
* the busclk wd fires
*/
@@ -863,6 +861,8 @@ msmsdcc_request(struct mmc_host *mmc, struct mmc_request *mrq)
msmsdcc_enable_clocks(host);
spin_lock_irqsave(&host->lock, flags);
+ host->curr.mrq = mrq;
+
if (mrq->data && mrq->data->flags & MMC_DATA_READ)
/* Queue/read data, daisy-chain command when data starts */
msmsdcc_start_data(host, mrq->data, mrq->cmd, 0);