diff options
Diffstat (limited to 'drivers/memstick')
-rw-r--r-- | drivers/memstick/core/mspro_block.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c index a41634699f84..9e600d22f40e 100644 --- a/drivers/memstick/core/mspro_block.c +++ b/drivers/memstick/core/mspro_block.c | |||
@@ -677,10 +677,10 @@ try_again: | |||
677 | continue; | 677 | continue; |
678 | } | 678 | } |
679 | 679 | ||
680 | t_sec = msb->block_req->sector << 9; | 680 | t_sec = blk_rq_pos(msb->block_req) << 9; |
681 | sector_div(t_sec, msb->page_size); | 681 | sector_div(t_sec, msb->page_size); |
682 | 682 | ||
683 | count = msb->block_req->nr_sectors << 9; | 683 | count = blk_rq_sectors(msb->block_req) << 9; |
684 | count /= msb->page_size; | 684 | count /= msb->page_size; |
685 | 685 | ||
686 | param.system = msb->system; | 686 | param.system = msb->system; |
@@ -745,7 +745,7 @@ static int mspro_block_complete_req(struct memstick_dev *card, int error) | |||
745 | t_len *= msb->page_size; | 745 | t_len *= msb->page_size; |
746 | } | 746 | } |
747 | } else | 747 | } else |
748 | t_len = msb->block_req->nr_sectors << 9; | 748 | t_len = blk_rq_sectors(msb->block_req) << 9; |
749 | 749 | ||
750 | dev_dbg(&card->dev, "transferred %x (%d)\n", t_len, error); | 750 | dev_dbg(&card->dev, "transferred %x (%d)\n", t_len, error); |
751 | 751 | ||