diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-09 13:16:04 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-09 13:16:03 -0800 |
| commit | 70135dc083342312b6aad63af2eb1356379ed1d8 (patch) | |
| tree | 096295737b460a0c2f4ec0cde39f9548d3a866e4 /drivers/mmc/card | |
| parent | bf7be66d8788baf0699dbf8cfa17c4d969387d81 (diff) | |
| parent | 15c8f04a4661655e05fbc4a37b30b4a6e2e4f4a8 (diff) | |
Merge "mmc: block: Fix issue with deferred resume when CQ is enabled"
Diffstat (limited to 'drivers/mmc/card')
| -rw-r--r-- | drivers/mmc/card/block.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index efbecb6e1dd0..52e3e9b5b778 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -3855,10 +3855,6 @@ static int mmc_blk_cmdq_issue_rq(struct mmc_queue *mq, struct request *req) mmc_get_card(card); -#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME - if (mmc_bus_needs_resume(card->host)) - mmc_resume_bus(card->host); -#endif if (!card->host->cmdq_ctx.active_reqs && mmc_card_doing_bkops(card)) { ret = mmc_cmdq_halt(card->host, true); if (ret) |