evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mmc: card: Update multi_cmd_ioctl path to support cmdq"

Browse source
This commit is contained in:
Linux Build Service Account 2018-05-30 21:10:30 -07:00 • committed by Gerrit - the friendly Code Review server
commit 07c1b26257
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/mmc/card/block.c
View file

@ -1301,9 +1301,26 @@ static int mmc_blk_ioctl_multi_cmd(struct block_device *bdev,
mmc_get_card(card);
if (mmc_card_cmdq(card)) {
err = mmc_cmdq_halt(card->host, true);
if (err) {
pr_err("%s: halt failed while doing %s err (%d)\n",
mmc_hostname(card->host),
__func__, err);
mmc_put_card(card);
goto cmd_done;
}
}
for (i = 0; i < num_of_cmds && !ioc_err; i++)
ioc_err = __mmc_blk_ioctl_cmd(card, md, idata[i]);
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);
/* copy to user if data and response */