mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
mmc: mmc_test: Ensure command queue is disabled for testing
mmc_test disables the command queue because none of the tests use the
command queue. However the Reset Test will re-enable it, so disable it in
that case too.
Fixes: 9d4579a85c
("mmc: mmc_test: Disable Command Queue while mmc_test is used")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
d2383318c5
commit
23a185254a
1 changed files with 9 additions and 2 deletions
|
@ -2320,10 +2320,17 @@ static int mmc_test_reset(struct mmc_test_card *test)
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
err = mmc_hw_reset(host);
|
err = mmc_hw_reset(host);
|
||||||
if (!err)
|
if (!err) {
|
||||||
|
/*
|
||||||
|
* Reset will re-enable the card's command queue, but tests
|
||||||
|
* expect it to be disabled.
|
||||||
|
*/
|
||||||
|
if (card->ext_csd.cmdq_en)
|
||||||
|
mmc_cmdq_disable(card);
|
||||||
return RESULT_OK;
|
return RESULT_OK;
|
||||||
else if (err == -EOPNOTSUPP)
|
} else if (err == -EOPNOTSUPP) {
|
||||||
return RESULT_UNSUP_HOST;
|
return RESULT_UNSUP_HOST;
|
||||||
|
}
|
||||||
|
|
||||||
return RESULT_FAIL;
|
return RESULT_FAIL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue