From e64c6c483e2ba8532c1ccde52004a7076e631f39 Mon Sep 17 00:00:00 2001
From: Amit Kumar Salecha <amit.salecha@qlogic.com>
Date: Mon, 29 Mar 2010 02:43:44 +0000
Subject: [PATCH] --- yaml --- r: 193802 b: refs/heads/master c:
 e270299a2f7a3040fe598113f74c2a7d5f63b582 h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/net/netxen/netxen_nic_init.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c1fd961d6b90..905f233ddf7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10c0f2a852a529eacf2f223bbaef47832224a521
+refs/heads/master: e270299a2f7a3040fe598113f74c2a7d5f63b582
diff --git a/trunk/drivers/net/netxen/netxen_nic_init.c b/trunk/drivers/net/netxen/netxen_nic_init.c
index 141bc4389fec..439f3e859693 100644
--- a/trunk/drivers/net/netxen/netxen_nic_init.c
+++ b/trunk/drivers/net/netxen/netxen_nic_init.c
@@ -1019,6 +1019,16 @@ netxen_load_firmware(struct netxen_adapter *adapter)
 
 			flashaddr += 8;
 		}
+
+		size = (__force u32)nx_get_fw_size(adapter) % 8;
+		if (size) {
+			data = cpu_to_le64(ptr64[i]);
+
+			if (adapter->pci_mem_write(adapter,
+						flashaddr, data))
+				return -EIO;
+		}
+
 	} else {
 		u64 data;
 		u32 hi, lo;