From 2a37d4a892b45e0152a29f2d3db9b3ecb6f1521a Mon Sep 17 00:00:00 2001
From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Date: Wed, 22 Aug 2012 07:45:25 -0400
Subject: [PATCH] --- yaml --- r: 328907 b: refs/heads/master c:
 d9e62e513081c66d85bb0b91740ce3313c56b546 h: refs/heads/master i:   328905:
 7d4c7a95218a30b8048f0cc86f5e4be8775bc7c2   328903:
 eb840e2a1262aa1e756d87d47d9133e663e39765 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/qla4xxx/ql4_os.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cc771ba5db01..3391f599ca0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e9157c832b0dd0a8916278355cf5b15cd19c3c9
+refs/heads/master: d9e62e513081c66d85bb0b91740ce3313c56b546
diff --git a/trunk/drivers/scsi/qla4xxx/ql4_os.c b/trunk/drivers/scsi/qla4xxx/ql4_os.c
index fa1a3594edd5..f06b7c5b6b9a 100644
--- a/trunk/drivers/scsi/qla4xxx/ql4_os.c
+++ b/trunk/drivers/scsi/qla4xxx/ql4_os.c
@@ -3487,6 +3487,15 @@ static void qla4xxx_free_adapter(struct scsi_qla_host *ha)
 		ha->isp_ops->disable_intrs(ha);
 	}
 
+	if (is_qla40XX(ha)) {
+		writel(set_rmask(CSR_SCSI_PROCESSOR_INTR),
+		       &ha->reg->ctrl_status);
+		readl(&ha->reg->ctrl_status);
+	} else if (is_qla8022(ha)) {
+		writel(0, &ha->qla4_8xxx_reg->host_int);
+		readl(&ha->qla4_8xxx_reg->host_int);
+	}
+
 	/* Remove timer thread, if present */
 	if (ha->timer_active)
 		qla4xxx_stop_timer(ha);