1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index c2187d5e9070..156cabfa61c3 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1334,7 +1334,6 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
         brq->data.blksz = 512;
         brq->stop.opcode = MMC_STOP_TRANSMISSION;
         brq->stop.arg = 0;
-        brq->stop.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
         brq->data.blocks = blk_rq_sectors(req);
 
         /*
@@ -1377,9 +1376,15 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
         if (rq_data_dir(req) == READ) {
                 brq->cmd.opcode = readcmd;
                 brq->data.flags |= MMC_DATA_READ;
+                if (brq->mrq.stop)
+                        brq->stop.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 |
+                                        MMC_CMD_AC;
         } else {
                 brq->cmd.opcode = writecmd;
                 brq->data.flags |= MMC_DATA_WRITE;
+                if (brq->mrq.stop)
+                        brq->stop.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B |
+                                        MMC_CMD_AC;
         }
 
         if (do_rel_wr)