Skip to content

Commit

Permalink
mmc: msm_sdcc: Don't set host->curr.mrq until after we're sure the bu…
Browse files Browse the repository at this point in the history
…sclk timer won't fire

Signed-off-by: San Mehat <san@google.com>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
  • Loading branch information
Dmitry Shmidt authored and Daniel Walker committed Mar 18, 2010
1 parent 24bbd7d commit 91bb649
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/mmc/host/msm_sdcc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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);
Expand Down

0 comments on commit 91bb649

Please sign in to comment.