Commit f932d58a authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/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
...@@ -3739,10 +3739,8 @@ static irqreturn_t megasas_isr_fusion(int irq, void *devp) ...@@ -3739,10 +3739,8 @@ static irqreturn_t megasas_isr_fusion(int irq, void *devp)
if (instance->mask_interrupts) if (instance->mask_interrupts)
return IRQ_NONE; return IRQ_NONE;
#if defined(ENABLE_IRQ_POLL)
if (irq_context->irq_poll_scheduled) if (irq_context->irq_poll_scheduled)
return IRQ_HANDLED; return IRQ_HANDLED;
#endif
if (!instance->msix_vectors) { if (!instance->msix_vectors) {
mfiStatus = instance->instancet->clear_intr(instance); mfiStatus = instance->instancet->clear_intr(instance);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment