summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsutosh Das <asutoshd@codeaurora.org>2018-05-15 10:14:00 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2018-06-21 01:55:42 -0700
commit2daa49b1a8727b5c5133609347e4dc76ed3f9ae0 (patch)
tree0d618000f04131ff78b9c409df75ce281560dbd7
parent2386158c7be40e15d74aab3d18a54001047f0442 (diff)
mmc: block: Don't unhalt if switch to CQ mode fails
There's no reason to unhalt if switching to CQ mode fails. Since card is not in CQ mode, let the controller be halted. The caller will handle this error. CRs-fixed: 2241401 Change-Id: I307753ad66d291168a55f760565cc141d7c83c31 Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
-rw-r--r--drivers/mmc/card/block.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 13e0df67d3b7..0747f22ce56c 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -3995,6 +3995,7 @@ cmdq_switch:
pr_err("%s: %s: mmc_blk_cmdq_switch failed: %d\n",
mmc_hostname(host), __func__, err);
ret = err;
+ goto out;
}
cmdq_unhalt:
err = mmc_cmdq_halt(host, false);