acenic: Pass up error code from ace_load_firmware()
If ace_load_firmware() fails, ace_init() cleans up but still returns 0, leading to an oops as seen in <http://bugs.debian.org/521383>. It should pass the error code up. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
5fdb9973c1
commit
6c60e0c30c
|
@ -1209,7 +1209,8 @@ static int __devinit ace_init(struct net_device *dev)
|
||||||
memset(ap->info, 0, sizeof(struct ace_info));
|
memset(ap->info, 0, sizeof(struct ace_info));
|
||||||
memset(ap->skb, 0, sizeof(struct ace_skb));
|
memset(ap->skb, 0, sizeof(struct ace_skb));
|
||||||
|
|
||||||
if (ace_load_firmware(dev))
|
ecode = ace_load_firmware(dev);
|
||||||
|
if (ecode)
|
||||||
goto init_error;
|
goto init_error;
|
||||||
|
|
||||||
ap->fw_running = 0;
|
ap->fw_running = 0;
|
||||||
|
|
Loading…
Reference in a new issue