Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[platform/kernel/linux-rpi.git] / drivers / scsi / mpt3sas / mpt3sas_scsih.c

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 89be017..8cd3782 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -2352,7 +2352,7 @@ scsih_slave_configure(struct scsi_device *sdev)
                 ** merged and can eliminate holes created during merging
                 ** operation.
                 **/
-               queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES,
+               blk_queue_flag_set(QUEUE_FLAG_NOMERGES,
                                sdev->request_queue);
                blk_queue_virt_boundary(sdev->request_queue,
                                ioc->page_size - 1);