From: Adrian Hunter Date: Mon, 13 Mar 2017 12:36:40 +0000 (+0200) Subject: mmc: block: Change mmc_apply_rel_rw() to get block address from the request X-Git-Tag: v4.12-rc1~128^2~50 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9cb38f7a2d0aab5730ac18117ab2f5c9e3d4a826;p=karo-tx-linux.git mmc: block: Change mmc_apply_rel_rw() to get block address from the request mmc_apply_rel_rw() will be used by Software Command Queuing also. In that case the command argument is not the block address so change mmc_apply_rel_rw() to get block address from the request. Signed-off-by: Adrian Hunter Reviewed-by: Linus Walleij Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index d189e8c4436e..6d2c302c3673 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1309,7 +1309,7 @@ static inline void mmc_apply_rel_rw(struct mmc_blk_request *brq, { if (!(card->ext_csd.rel_param & EXT_CSD_WR_REL_PARAM_EN)) { /* Legacy mode imposes restrictions on transfers. */ - if (!IS_ALIGNED(brq->cmd.arg, card->ext_csd.rel_sectors)) + if (!IS_ALIGNED(blk_rq_pos(req), card->ext_csd.rel_sectors)) brq->data.blocks = 1; if (brq->data.blocks > card->ext_csd.rel_sectors)