Merge remote-tracking branch 'mkp-scsi/4.10/scsi-fixes' into fixes

db27edf8 · James Bottomley · 7ce7d89f · 7961d53d · db27edf8 · db27edf8
Commit db27edf8 authored Dec 26, 2016 by James Bottomley
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/scsi/qedi/Kconfig drivers/scsi/qedi/Kconfig +1 -1

drivers/scsi/scsi_lib.c drivers/scsi/scsi_lib.c +1 -1

No files found.
--- a/drivers/scsi/qedi/Kconfig
+++ b/drivers/scsi/qedi/Kconfig
 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

--- 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);