From 7f89bd68b39858a824f9efd9fe1580136d5e8050 Mon Sep 17 00:00:00 2001
From: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Date: Tue, 4 Aug 2009 16:12:13 -0700
Subject: [PATCH] --- yaml --- r: 161050 b: refs/heads/master c:
 eb94114bfd894dce1955e2ece575db544cecd921 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_isr.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d3bf6edca48a..bfe2b104893b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80de7efa6d6a4eb72e917bb2d814f38332090d45
+refs/heads/master: eb94114bfd894dce1955e2ece575db544cecd921
diff --git a/trunk/drivers/scsi/qla2xxx/qla_isr.c b/trunk/drivers/scsi/qla2xxx/qla_isr.c
index 40014f3407b9..74fa6f992041 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_isr.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_isr.c
@@ -1769,8 +1769,10 @@ qla24xx_msix_rsp_q(int irq, void *dev_id)
 
 	vha = qla25xx_get_host(rsp);
 	qla24xx_process_response_queue(vha, rsp);
-	WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
-
+	if (!ha->mqenable) {
+		WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
+		RD_REG_DWORD_RELAXED(&reg->hccr);
+	}
 	spin_unlock_irq(&ha->hardware_lock);
 
 	return IRQ_HANDLED;