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 <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit 9cb38f7a2d0aab5730ac18117ab2f5c9e3d4a826)

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 05f3c4f..c571786 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1314,7 +1314,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)