diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-12-27 05:32:48 +0100 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-12-27 05:32:48 +0100 |
| commit | db27edf80c894e89b9710d20a8d0f02327f36ca0 (patch) | |
| tree | 3936038d135ed116e4c7282fa1094d2fea929904 /drivers/scsi | |
| parent | Linux 4.10-rc1 (diff) | |
| parent | scsi: qedi: fix build, depends on UIO (diff) | |
| download | linux-db27edf80c894e89b9710d20a8d0f02327f36ca0.tar.xz linux-db27edf80c894e89b9710d20a8d0f02327f36ca0.zip | |
Merge remote-tracking branch 'mkp-scsi/4.10/scsi-fixes' into fixes
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/qedi/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qedi/Kconfig b/drivers/scsi/qedi/Kconfig index 23ca8a274586..21331453db7b 100644 --- a/drivers/scsi/qedi/Kconfig +++ b/drivers/scsi/qedi/Kconfig @@ -1,6 +1,6 @@ config QEDI tristate "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver Support" - depends on PCI && SCSI + depends on PCI && SCSI && UIO depends on QED select SCSI_ISCSI_ATTRS select QED_LL2 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index c35b6de4ca64..9fd9a977c695 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -2893,7 +2893,7 @@ scsi_internal_device_block(struct scsi_device *sdev) * request queue. */ if (q->mq_ops) { - blk_mq_stop_hw_queues(q); + blk_mq_quiesce_queue(q); } else { spin_lock_irqsave(q->queue_lock, flags); blk_stop_queue(q); |