From 271d0b5c27fe65383ed81f4c2175b3d0ea70935f Mon Sep 17 00:00:00 2001
From: Sarang Radke <sarang.radke@qlogic.com>
Date: Wed, 23 Mar 2011 08:07:33 -0700
Subject: [PATCH] --- yaml --- r: 242723 b: refs/heads/master c:
 5fa8b573134108a333a317378998a9f1299c4dd6 h: refs/heads/master i:   242721:
 514cdc2b6874ebf49e88ecb361d3fd15585ff829   242719:
 7591a801c6e6aa3a56666ba43f047536228a47bf v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/qla4xxx/ql4_nx.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cf34fb421145..21a9f7f6be0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dea642afd9187728d119fce5c82a7ed9faa9b6a
+refs/heads/master: 5fa8b573134108a333a317378998a9f1299c4dd6
diff --git a/trunk/drivers/scsi/qla4xxx/ql4_nx.c b/trunk/drivers/scsi/qla4xxx/ql4_nx.c
index 3d5ef2df4134..35381cb0936e 100644
--- a/trunk/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/trunk/drivers/scsi/qla4xxx/ql4_nx.c
@@ -2304,14 +2304,13 @@ qla4_8xxx_enable_intrs(struct scsi_qla_host *ha)
 void
 qla4_8xxx_disable_intrs(struct scsi_qla_host *ha)
 {
-	if (test_bit(AF_INTERRUPTS_ON, &ha->flags))
+	if (test_and_clear_bit(AF_INTERRUPTS_ON, &ha->flags))
 		qla4_8xxx_mbx_intr_disable(ha);
 
 	spin_lock_irq(&ha->hardware_lock);
 	/* BIT 10 - set */
 	qla4_8xxx_wr_32(ha, ha->nx_legacy_intr.tgt_mask_reg, 0x0400);
 	spin_unlock_irq(&ha->hardware_lock);
-	clear_bit(AF_INTERRUPTS_ON, &ha->flags);
 }
 
 struct ql4_init_msix_entry {