From dcf9df85a8e8b4937b9b459f1067e8db3881441c Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Thu, 16 Jun 2016 15:31:33 +0800 Subject: [PATCH] mmc: block: Fix tag condition with packed writes Apparently a cut-and-paste error, 'do_data_tag' is using 'brq' for data size even though 'brq' has not been set up. Instead use blk_rq_sectors(). Change-Id: I721c02d7a937844ecedeb6c24d8439f8a9c29fef Signed-off-by: Adrian Hunter Signed-off-by: Shawn Lin --- drivers/mmc/card/block.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 67f44aed5000..17d94b61c8f4 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -2041,8 +2041,7 @@ static void mmc_blk_packed_hdr_wrq_prep(struct mmc_queue_req *mqrq, do_data_tag = (card->ext_csd.data_tag_unit_size) && (prq->cmd_flags & REQ_META) && (rq_data_dir(prq) == WRITE) && - ((brq->data.blocks * brq->data.blksz) >= - card->ext_csd.data_tag_unit_size); + blk_rq_bytes(prq) >= card->ext_csd.data_tag_unit_size; /* Argument of CMD23 */ packed_cmd_hdr[(i * 2)] = (do_rel_wr ? MMC_CMD23_ARG_REL_WR : 0) | -- 2.34.1