Commit f932d58a authored Jul 18, 2020 by Linus Torvalds

scsi into master

Pull SCSI fix from James Bottomley:
 "One small driver fix. Although the one liner makes it sound like a
  cosmetic change, it's a regression fix for the megaraid_sas driver"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: megaraid_sas: Remove undefined ENABLE_IRQ_POLL macro

parents e26aeee8 07d3f045

drivers/scsi/megaraid/megaraid_sas_fusion.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -3739,10 +3739,8 @@ static irqreturn_t megasas_isr_fusion(int irq, void *devp)
		if (instance->mask_interrupts)
		return IRQ_NONE;

		#if defined(ENABLE_IRQ_POLL)
		if (irq_context->irq_poll_scheduled)
		return IRQ_HANDLED;
		#endif

		if (!instance->msix_vectors) {
		mfiStatus = instance->instancet->clear_intr(instance);

Admin message