Merge tag 'seccomp-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[linux-beck.git] / drivers / memstick / core / ms_block.c

diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
index 24f2f8473deeccf796b8e34771c1f37085b6b4ad..84abf9d3c24e62410b242520e7d5f20553e784dd 100644 (file)
--- a/drivers/memstick/core/ms_block.c
+++ b/drivers/memstick/core/ms_block.c
@@ -1909,7 +1909,7 @@ static void msb_io_work(struct work_struct *work)
                lba = blk_rq_pos(msb->req);
 
                sector_div(lba, msb->page_size / 512);
-               page = do_div(lba, msb->pages_in_block);
+               page = sector_div(lba, msb->pages_in_block);
 
                if (rq_data_dir(msb->req) == READ)
                        error = msb_do_read_request(msb, lba, page, sg,