diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-12-26 23:32:48 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-12-26 23:32:48 -0500 |
| commit | db27edf80c894e89b9710d20a8d0f02327f36ca0 (patch) | |
| tree | 3936038d135ed116e4c7282fa1094d2fea929904 /drivers | |
| parent | 7ce7d89f48834cefece7804d38fc5d85382edf77 (diff) | |
| parent | 7961d53d22375bb9e8ae8063533b9059102ed39d (diff) | |
Merge remote-tracking branch 'mkp-scsi/4.10/scsi-fixes' into fixes
Diffstat (limited to 'drivers')
| -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 @@ | |||
| 1 | config QEDI | 1 | config QEDI |
| 2 | tristate "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver Support" | 2 | tristate "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver Support" |
| 3 | depends on PCI && SCSI | 3 | depends on PCI && SCSI && UIO |
| 4 | depends on QED | 4 | depends on QED |
| 5 | select SCSI_ISCSI_ATTRS | 5 | select SCSI_ISCSI_ATTRS |
| 6 | select QED_LL2 | 6 | 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) | |||
| 2893 | * request queue. | 2893 | * request queue. |
| 2894 | */ | 2894 | */ |
| 2895 | if (q->mq_ops) { | 2895 | if (q->mq_ops) { |
| 2896 | blk_mq_stop_hw_queues(q); | 2896 | blk_mq_quiesce_queue(q); |
| 2897 | } else { | 2897 | } else { |
| 2898 | spin_lock_irqsave(q->queue_lock, flags); | 2898 | spin_lock_irqsave(q->queue_lock, flags); |
| 2899 | blk_stop_queue(q); | 2899 | blk_stop_queue(q); |