diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-10-05 16:09:50 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-05 16:09:50 -0700 |
| commit | 8a0ae03d446805aba81b196740ed022af58882f6 (patch) | |
| tree | d5108c785826da2c00b9070dd9b478f725efeffe /drivers | |
| parent | d640f06626f6177184c8bda4f8543d55ee84b13c (diff) | |
| parent | 6cc74e75a0d07d4f1b94e7d4becfac0d9d0a0648 (diff) | |
Merge "mmc: block: Unhalt the command queue before releasing mmc host"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/card/block.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index c002fa5ff602..4ff6213f0e6e 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1224,16 +1224,16 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev, ioc_err = __mmc_blk_ioctl_cmd(card, md, idata); - mmc_put_card(card); - - err = mmc_blk_ioctl_copy_to_user(ic_ptr, idata); - if (mmc_card_cmdq(card)) { if (mmc_cmdq_halt(card->host, false)) pr_err("%s: %s: cmdq unhalt failed\n", mmc_hostname(card->host), __func__); } + mmc_put_card(card); + + err = mmc_blk_ioctl_copy_to_user(ic_ptr, idata); + cmd_done: mmc_blk_put(md); cmd_err: |