Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c60e0c3 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

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: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5fdb9973

drivers/net/acenic.c

+2 −1
Original line number Diff line number Diff line
@@ -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;