From 1500d1ddd1cf8cc32de62c0298fe905786b59e74 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 2 Dec 2009 17:21:07 -0800 Subject: [PATCH] --- yaml --- r: 196691 b: refs/heads/master c: 91bb64952a8c57826b01878925bea8831c71a492 h: refs/heads/master i: 196689: b3a3af8ef73adfb5ee6118fe32ced732ed2a4625 196687: 9985d031e6021c954d234a9e9363b7fdd044f21a v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/msm_sdcc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9076b86aac90..46ad852e2e74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24bbd7d5b422cde6a149ac2f9ac6e61e66536532 +refs/heads/master: 91bb64952a8c57826b01878925bea8831c71a492 diff --git a/trunk/drivers/mmc/host/msm_sdcc.c b/trunk/drivers/mmc/host/msm_sdcc.c index d42a2dd69325..28899ee392e2 100644 --- a/trunk/drivers/mmc/host/msm_sdcc.c +++ b/trunk/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);