From 32b3d45c3ed6c7080e0a38163ae2e347a88f63f2 Mon Sep 17 00:00:00 2001 From: Amit Kumar Salecha Date: Thu, 1 Apr 2010 19:01:28 +0000 Subject: [PATCH] --- yaml --- r: 193925 b: refs/heads/master c: 0bc92b5b4987ab55f2b75ef42251476b2e049e3d h: refs/heads/master i: 193923: d3c02a7fe745334d5a44816a4c4c826e540e6b8a v: v3 --- [refs] | 2 +- trunk/drivers/net/qlcnic/qlcnic_init.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f5a230fc055f..0125175af6e6 100644 --- 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 index 7c34e4e29b3f..0a424e038cff 100644 --- 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;