---

yaml --- r: 193925 b: refs/heads/master c: 0bc92b5 h: refs/heads/master i: 193923: d3c02a7 v: v3
git-mirror · Apr 3, 2010 · 32b3d45 · 32b3d45
1 parent 48f0ccb
commit 32b3d45
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e4f10f6498bc5038c0a110b5f21682fcb5578d7
+refs/heads/master: 0bc92b5b4987ab55f2b75ef42251476b2e049e3d
diff --git a/trunk/drivers/net/qlcnic/qlcnic_init.c b/trunk/drivers/net/qlcnic/qlcnic_init.c
@@ -949,6 +949,16 @@ qlcnic_load_firmware(struct qlcnic_adapter *adapter)
 
 			flashaddr += 8;
 		}
+
+		size = (__force u32)qlcnic_get_fw_size(adapter) % 8;
+		if (size) {
+			data = cpu_to_le64(ptr64[i]);
+
+			if (qlcnic_pci_mem_write_2M(adapter,
+						flashaddr, data))
+				return -EIO;
+		}
+
 	} else {
 		u64 data;
 		u32 hi, lo;