From 917162f8edd032a6792d98d42357043a2841dd42 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 2 Mar 2009 01:53:03 -0800
Subject: [PATCH] --- yaml --- r: 134971 b: refs/heads/master c:
 093fb6968deeed46bf93266eee44baeb213bf253 h: refs/heads/master i:   134969:
 226888654bf6c783a9c68a4e605aa3a6022c6271   134967:
 b2cd29b28182f0b2e37b8cc025c6590c4c16356b v: v3

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

diff --git a/[refs] b/[refs]
index 639a1ba19553..cc3b4a31bed4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3b3240450ab8a1f3e52c5a69d53113deb6f91c5
+refs/heads/master: 093fb6968deeed46bf93266eee44baeb213bf253
diff --git a/trunk/drivers/net/typhoon.c b/trunk/drivers/net/typhoon.c
index ec2541c8c229..9bba78716367 100644
--- a/trunk/drivers/net/typhoon.c
+++ b/trunk/drivers/net/typhoon.c
@@ -1377,6 +1377,7 @@ typhoon_request_firmware(struct typhoon *tp)
 		err = -ENOMEM;
 		goto out_err;
 	}
+	memcpy(typhoon_fw_image, typhoon_fw->data, typhoon_fw->size);
 
 	return 0;