Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91bb6495 authored by Dmitry Shmidt's avatar Dmitry Shmidt Committed by Daniel Walker
Browse files

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



Signed-off-by: default avatarSan Mehat <san@google.com>
Signed-off-by: default avatarDaniel Walker <dwalker@codeaurora.org>
parent 24bbd7d5

drivers/mmc/host/msm_sdcc.c

+2 −2
Original line number Diff line number Diff line
@@ -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);