Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / memstick / core / mspro_block.c

diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index bd83fa0a4970fb13a5ddef788d1c68a5a7b21300..972b87069d55aad0e6d27eba6b7fbbba55064598 100644 (file)
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -1226,9 +1226,8 @@ static int mspro_block_init_disk(struct memstick_dev *card)
        blk_queue_prep_rq(msb->queue, mspro_block_prepare_req);
 
        blk_queue_bounce_limit(msb->queue, limit);
-       blk_queue_max_sectors(msb->queue, MSPRO_BLOCK_MAX_PAGES);
-       blk_queue_max_phys_segments(msb->queue, MSPRO_BLOCK_MAX_SEGS);
-       blk_queue_max_hw_segments(msb->queue, MSPRO_BLOCK_MAX_SEGS);
+       blk_queue_max_hw_sectors(msb->queue, MSPRO_BLOCK_MAX_PAGES);
+       blk_queue_max_segments(msb->queue, MSPRO_BLOCK_MAX_SEGS);
        blk_queue_max_segment_size(msb->queue,
                                   MSPRO_BLOCK_MAX_PAGES * msb->page_size);