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;