diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index a66cae904383..1ca30a1bb75d 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -2989,7 +2989,7 @@ static void mmc_blk_cmdq_shutdown(struct mmc_queue *mq)
 	err = mmc_cmdq_halt(host, true);
 	if (err) {
 		pr_err("%s: halt: failed: %d\n", __func__, err);
-		return;
+		goto out;
 	}
 
 	/* disable CQ mode in card */
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index e9827c52e283..bf6498db2f2e 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1541,8 +1541,7 @@ static int mmc_select_cmdq(struct mmc_card *card)
 		mmc_card_clr_cmdq(card);
 		ret = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_CMDQ, 0,
 				 card->ext_csd.generic_cmd6_time);
-		if (ret)
-			goto out;
+		goto out;
 	}
 
 	mmc_host_clk_release(card->host);