From 5683e79bd1db1002d99d084d1fde967f0da7842f Mon Sep 17 00:00:00 2001
From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Date: Wed, 6 Oct 2010 22:49:08 -0700
Subject: [PATCH] --- yaml --- r: 221456 b: refs/heads/master c:
 3710c60c09f555df69d12b0232702d062fe3bcd6 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/scsi/qla4xxx/ql4_init.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dcc40627cf7e..98bef96105b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 735e41543c12c245290cf652727893a66cbd8ab6
+refs/heads/master: 3710c60c09f555df69d12b0232702d062fe3bcd6
diff --git a/trunk/drivers/scsi/qla4xxx/ql4_init.c b/trunk/drivers/scsi/qla4xxx/ql4_init.c
index b6046afe370c..dc01fa3da5d1 100644
--- a/trunk/drivers/scsi/qla4xxx/ql4_init.c
+++ b/trunk/drivers/scsi/qla4xxx/ql4_init.c
@@ -1459,6 +1459,12 @@ int qla4xxx_initialize_adapter(struct scsi_qla_host *ha,
 exit_init_online:
 	set_bit(AF_ONLINE, &ha->flags);
 exit_init_hba:
+	if (is_qla8022(ha) && (status == QLA_ERROR)) {
+		/* Since interrupts are registered in start_firmware for
+		 * 82xx, release them here if initialize_adapter fails */
+		qla4xxx_free_irqs(ha);
+	}
+
 	DEBUG2(printk("scsi%ld: initialize adapter: %s\n", ha->host_no,
 	    status == QLA_ERROR ? "FAILED" : "SUCCEDED"));
 	return status;