---

yaml --- r: 226811 b: refs/heads/master c: 3e1350c h: refs/heads/master i: 226809: ece985d 226807: cce2da4 v: v3
git-mirror · Dec 21, 2010 · a80399b · a80399b
1 parent d9f3fd0
commit a80399b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);