xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
James Bottomley
2016-12-26 20:32:48 -08:00
parent 7ce7d89f48 7961d53d22
commit db27edf80c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/qedi/Kconfig
View File

@@ -1,6 +1,6 @@
config QEDI config QEDI
tristate "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver Support" tristate "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver Support"
depends on PCI && SCSI depends on PCI && SCSI && UIO
depends on QED depends on QED
select SCSI_ISCSI_ATTRS select SCSI_ISCSI_ATTRS
select QED_LL2 select QED_LL2

2
drivers/scsi/scsi_lib.c
View File

@@ -2893,7 +2893,7 @@ scsi_internal_device_block(struct scsi_device *sdev)
* request queue. * request queue.
*/ */
if (q->mq_ops) { if (q->mq_ops) {
blk_mq_stop_hw_queues(q); blk_mq_quiesce_queue(q);
} else { } else {
spin_lock_irqsave(q->queue_lock, flags); spin_lock_irqsave(q->queue_lock, flags);
blk_stop_queue(q); blk_stop_queue(q);