From: Saurav Kashyap <saurav.kashyap@qlogic.com>
Date: Thu, 11 Aug 2011 20:05:55 +0000 (-0700)
Subject: qla2xxx: Don't call alloc_fw_dump for ISP82XX.
X-Git-Tag: v2.6.39-400.9.0~822^2^2~27
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a5d5543105dd84eac0f949e28df79b690ad3eb20;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Don't call alloc_fw_dump for ISP82XX.

Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index f03e915f1877..54ea68cec4c5 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1509,7 +1509,8 @@ enable_82xx_npiv:
 				    &ha->fw_xcb_count, NULL, NULL,
 				    &ha->max_npiv_vports, NULL);
 
-				if (!fw_major_version && ql2xallocfwdump)
+				if (!fw_major_version && ql2xallocfwdump
+				    && !IS_QLA82XX(ha))
 					qla2x00_alloc_fw_dump(vha);
 			}
 		} else {