From: Mark Brown <broonie@linaro.org>
Date: Fri, 14 Feb 2014 12:15:57 +0000 (+0000)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~163
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6a7fe00e1f5a2e77b777b6e3b90c924c95bfa866;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
---

6a7fe00e1f5a2e77b777b6e3b90c924c95bfa866
diff --cc drivers/mmc/card/block.c
index 4f98f8b38395,9aca9462a12f..9cf08651d2bf
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@@ -1937,12 -1931,8 +1937,13 @@@ static int mmc_blk_issue_rq(struct mmc_
  	struct mmc_card *card = md->queue.card;
  	struct mmc_host *host = card->host;
  	unsigned long flags;
+ 	unsigned int cmd_flags = req ? req->cmd_flags : 0;
  
 +#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME
 +	if (mmc_bus_needs_resume(card->host))
 +		mmc_resume_bus(card->host);
 +#endif
 +
  	if (req && !mq->mqrq_prev->req)
  		/* claim host only for the first request */
  		mmc_claim_host(card->host);