Merge branches 'pci/misc' and 'pci/msi' into next

[karo-tx-linux.git] / block / blk-settings.c

diff --git a/block/blk-settings.c b/block/blk-settings.c
index aa02247d227e530223d15e35ecabdacc2b801ce1..6ed2cbe5e8c9ae340233b0491255dfed40947590 100644 (file)
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -257,9 +257,7 @@ void blk_limits_max_hw_sectors(struct queue_limits *limits, unsigned int max_hw_
                       __func__, max_hw_sectors);
        }
 
-       limits->max_hw_sectors = max_hw_sectors;
-       limits->max_sectors = min_t(unsigned int, max_hw_sectors,
-                                   BLK_DEF_MAX_SECTORS);
+       limits->max_sectors = limits->max_hw_sectors = max_hw_sectors;
 }
 EXPORT_SYMBOL(blk_limits_max_hw_sectors);