diff --git a/[refs] b/[refs] index 1e0575a720dc..385e42913095 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fdb9973c10c2d2e046da0976782ece25e78dc8b +refs/heads/master: 6c60e0c30c80fcd53e61701b7865a85283f8a341 diff --git a/trunk/drivers/net/acenic.c b/trunk/drivers/net/acenic.c index 5f0b05c2d71f..d82a9a994753 100644 --- a/trunk/drivers/net/acenic.c +++ b/trunk/drivers/net/acenic.c @@ -1209,7 +1209,8 @@ static int __devinit ace_init(struct net_device *dev) memset(ap->info, 0, sizeof(struct ace_info)); memset(ap->skb, 0, sizeof(struct ace_skb)); - if (ace_load_firmware(dev)) + ecode = ace_load_firmware(dev); + if (ecode) goto init_error; ap->fw_running = 0;