diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2020-09-15 11:24:32 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2020-09-15 11:36:40 -0400 |
| commit | 02f7415054d7054955fd3c43902ad79437b09fbc (patch) | |
| tree | 87a7def48bbe373a820109805b974b53b1d382fa /drivers/scsi/mpt3sas | |
| parent | 2de7649cff445ec35a6c5ee1a8e19be186d890fc (diff) | |
| parent | 244359c99fd90f1c61c3944f93250f8219435c75 (diff) | |
Merge branch '5.9/scsi-fixes' into 5.10/scsi-ufs
Resolve UFS discrepancies between fixes and queue.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/mpt3sas')
| -rw-r--r-- | drivers/scsi/mpt3sas/mpt3sas_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 4aae441211bd..24dd90a72a80 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -1731,7 +1731,7 @@ _base_irqpoll(struct irq_poll *irqpoll, int budget) reply_q = container_of(irqpoll, struct adapter_reply_queue, irqpoll); if (reply_q->irq_line_enable) { - disable_irq(reply_q->os_irq); + disable_irq_nosync(reply_q->os_irq); reply_q->irq_line_enable = false; } num_entries = _base_process_reply_queue(reply_q); |