From a80399b8d0b6fe54a271b0b45463a5fe3543c374 Mon Sep 17 00:00:00 2001 From: Vikas Chaudhary Date: Thu, 2 Dec 2010 22:12:03 -0800 Subject: [PATCH] --- yaml --- r: 226811 b: refs/heads/master c: 3e1350c4dc8900476c4db2066c00f13e9e939817 h: refs/heads/master i: 226809: ece985dfaf6bff7d40c298c4056ac3fd30325cb4 226807: cce2da49bac8daaa91d81a8e0d46c975c21cb474 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_isr.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2e2ccedc51fa..abb00ccd0d77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f0e385fdafb7d6c8ded6464fa6421c735d96caf +refs/heads/master: 3e1350c4dc8900476c4db2066c00f13e9e939817 diff --git a/trunk/drivers/scsi/qla4xxx/ql4_isr.c b/trunk/drivers/scsi/qla4xxx/ql4_isr.c index 7c33fd5943d5..5d9575cebff9 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_isr.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_isr.c @@ -1077,7 +1077,7 @@ int qla4xxx_request_irqs(struct scsi_qla_host *ha) ret = pci_enable_msi(ha->pdev); if (!ret) { ret = request_irq(ha->pdev->irq, qla4_8xxx_msi_handler, - IRQF_DISABLED|IRQF_SHARED, DRIVER_NAME, ha); + IRQF_SHARED, DRIVER_NAME, ha); if (!ret) { DEBUG2(ql4_printk(KERN_INFO, ha, "MSI: Enabled.\n")); set_bit(AF_MSI_ENABLED, &ha->flags); @@ -1095,7 +1095,7 @@ int qla4xxx_request_irqs(struct scsi_qla_host *ha) try_intx: /* Trying INTx */ ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler, - IRQF_DISABLED|IRQF_SHARED, DRIVER_NAME, ha); + IRQF_SHARED, DRIVER_NAME, ha); if (!ret) { DEBUG2(ql4_printk(KERN_INFO, ha, "INTx: Enabled.\n")); set_bit(AF_INTx_ENABLED, &ha->flags);