Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c

1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 9a68d2ea5f3e..b3981ed972bf 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -556,6 +556,7 @@ static int myri10ge_load_hotplug_firmware(struct myri10ge_priv *mgp, u32 * size)
         unsigned crc, reread_crc;
         const struct firmware *fw;
         struct device *dev = &mgp->pdev->dev;
+        unsigned char *fw_readback;
         struct mcp_gen_header *hdr;
         size_t hdr_offset;
         int status;
@@ -598,9 +599,15 @@ static int myri10ge_load_hotplug_firmware(struct myri10ge_priv *mgp, u32 * size)
                 mb();
                 readb(mgp->sram);
         }
+        fw_readback = vmalloc(fw->size);
+        if (!fw_readback) {
+                status = -ENOMEM;
+                goto abort_with_fw;
+        }
         /* corruption checking is good for parity recovery and buggy chipset */
-        memcpy_fromio(fw->data, mgp->sram + MYRI10GE_FW_OFFSET, fw->size);
-        reread_crc = crc32(~0, fw->data, fw->size);
+        memcpy_fromio(fw_readback, mgp->sram + MYRI10GE_FW_OFFSET, fw->size);
+        reread_crc = crc32(~0, fw_readback, fw->size);
+        vfree(fw_readback);
         if (crc != reread_crc) {
                 dev_err(dev, "CRC failed(fw-len=%u), got 0x%x (expect 0x%x)\n",
                         (unsigned)fw->size, reread_crc, crc);