Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db27edf8 authored by James Bottomley's avatar James Bottomley
Browse files

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

parents 7ce7d89f 7961d53d

drivers/scsi/qedi/Kconfig

+1 −1
Original line number Diff line number Diff line 
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

drivers/scsi/scsi_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -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);